[Gc-linux-cvs] linux/drivers/net/wireless/b43 Kconfig, 1.1, 1.2 main.c, 1.1, 1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net/wireless/b43
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/net/wireless/b43

Modified Files:
	Kconfig main.c 
Log Message:
Merge v2.6.32.

Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/wireless/b43/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.c	9 Dec 2009 18:42:53 -0000	1.1
--- main.c	9 Dec 2009 18:44:55 -0000	1.2
***************
*** 69,72 ****
--- 69,77 ----
  MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID);
  
+ #ifdef CONFIG_B43_DEFAULT_QOS_OFF
+ #define B43_QOS_DEFAULT 0
+ #else
+ #define B43_QOS_DEFAULT 1
+ #endif
  
  static int modparam_bad_frames_preempt;
***************
*** 91,95 ****
  MODULE_PARM_DESC(hwtkip, "Enable hardware tkip.");
  
! static int modparam_qos = 1;
  module_param_named(qos, modparam_qos, int, 0444);
  MODULE_PARM_DESC(qos, "Enable QOS support (default on)");
--- 96,100 ----
  MODULE_PARM_DESC(hwtkip, "Enable hardware tkip.");
  
! static int modparam_qos = B43_QOS_DEFAULT;
  module_param_named(qos, modparam_qos, int, 0444);
  MODULE_PARM_DESC(qos, "Enable QOS support (default on)");

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/wireless/b43/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Kconfig	9 Dec 2009 18:42:53 -0000	1.1
--- Kconfig	9 Dec 2009 18:44:55 -0000	1.2
***************
*** 147,148 ****
--- 147,159 ----
  	  This is only for debugging the PIO engine code. You do
  	  _NOT_ want to enable this.
+ 
+ config B43_DEFAULT_QOS_OFF
+ 	bool "Start with QoS disabled"
+ 	depends on B43
+ 	---help---
+ 	  This will start the driver with Quality Of Service disabled.
+ 
+ 	  Say Y if you are using an OpenFWWF firmware without QoS support
+ 	  and building the b43 driver in-kernel.
+ 	  Otherwise, say N.
+