aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Buesch <mbuesch@freenet.de>2006-02-02 13:49:15 -0500
committerJohn W. Linville <linville@tuxdriver.com>2006-03-27 11:18:29 -0500
commit8fa252d099d864f8848a9890f26d1a51a9c7ad32 (patch)
treeeac64bc0fcaa8b2e7b1dc2735e2848e7b9f79ad7
parent6465ce1bbf7fede82dccec342417105b10793b51 (diff)
[PATCH] bcm43xx: Wireless Ext update
Wireless Ext update: update we_version_source set enc_capa Signed-off-by: Michael Buesch <mbuesch@freenet.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_wx.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index fe6409a90901..c1d788d50f49 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -41,6 +41,11 @@
41#include "bcm43xx_main.h" 41#include "bcm43xx_main.h"
42#include "bcm43xx_radio.h" 42#include "bcm43xx_radio.h"
43 43
44
45/* The WIRELESS_EXT version, which is implemented by this driver. */
46#define BCM43xx_WX_VERSION 18
47
48
44/* Define to enable a printk on each wx handler function invocation */ 49/* Define to enable a printk on each wx handler function invocation */
45//#define BCM43xx_WX_DEBUG 50//#define BCM43xx_WX_DEBUG
46 51
@@ -282,7 +287,12 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
282 range->max_encoding_tokens = WEP_KEYS; 287 range->max_encoding_tokens = WEP_KEYS;
283 288
284 range->we_version_compiled = WIRELESS_EXT; 289 range->we_version_compiled = WIRELESS_EXT;
285 range->we_version_source = 16; 290 range->we_version_source = BCM43xx_WX_VERSION;
291
292 range->enc_capa = IW_ENC_CAPA_WPA |
293 IW_ENC_CAPA_WPA2 |
294 IW_ENC_CAPA_CIPHER_TKIP |
295 IW_ENC_CAPA_CIPHER_CCMP;
286 296
287 spin_lock_irqsave(&bcm->lock, flags); 297 spin_lock_irqsave(&bcm->lock, flags);
288 298