On Fri, Jul 17, 2009 at 09:34:36AM -0700, Reinette Chatre wrote: > From: Reinette Chatre <reinette.chatre@xxxxxxxxx> > > We need to provide a reasonable minimum that will result in a > working setup if used. Set minimum to be 10 to provide for > 4 standard TX queues + 1 command queue + 2 (unused) HCCA queues + > 4 HT queues (one per AC). > > We allow the user to change the number of queues used via a module > parameter and use this minimum value to check if it is valid. Without > this patch a user can select a value for the number of queues that > will result in a failing setup. > > Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx> > Reviewed-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > Acked-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > --- > This patch has already been submitted for wireless-testing, but we would > like to include this fix into 2.6.31 also if possible. > > This fixes http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=2011 When built against 2.6.31, I get this: CC [M] drivers/net/wireless/iwlwifi/iwl3945-base.o In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:55: drivers/net/wireless/iwlwifi/iwl-3945.h:115:1: warning: "IWL_MIN_NUM_QUEUES" redefined In file included from drivers/net/wireless/iwlwifi/iwl-3945.h:48, from drivers/net/wireless/iwlwifi/iwl3945-base.c:55: drivers/net/wireless/iwlwifi/iwl-dev.h:264:1: warning: this is the location of the previous definition CC [M] drivers/net/wireless/iwlwifi/iwl-3945.o In file included from drivers/net/wireless/iwlwifi/iwl-3945.c:45: drivers/net/wireless/iwlwifi/iwl-3945.h:115:1: warning: "IWL_MIN_NUM_QUEUES" redefined In file included from drivers/net/wireless/iwlwifi/iwl-3945.h:48, from drivers/net/wireless/iwlwifi/iwl-3945.c:45: drivers/net/wireless/iwlwifi/iwl-dev.h:264:1: warning: this is the location of the previous definition CC [M] drivers/net/wireless/iwlwifi/iwl-3945-rs.o In file included from drivers/net/wireless/iwlwifi/iwl-3945-rs.c:40: drivers/net/wireless/iwlwifi/iwl-3945.h:115:1: warning: "IWL_MIN_NUM_QUEUES" redefined In file included from drivers/net/wireless/iwlwifi/iwl-3945.h:48, from drivers/net/wireless/iwlwifi/iwl-3945-rs.c:40: drivers/net/wireless/iwlwifi/iwl-dev.h:264:1: warning: this is the location of the previous definition CC [M] drivers/net/wireless/iwlwifi/iwl-3945-led.o In file included from drivers/net/wireless/iwlwifi/iwl-3945-led.c:43: drivers/net/wireless/iwlwifi/iwl-3945.h:115:1: warning: "IWL_MIN_NUM_QUEUES" redefined In file included from drivers/net/wireless/iwlwifi/iwl-3945.h:48, from drivers/net/wireless/iwlwifi/iwl-3945-led.c:43: drivers/net/wireless/iwlwifi/iwl-dev.h:264:1: warning: this is the location of the previous definition -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. ¡Viva Honduras Libre! -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
