From 3511da94e2c3fe3dff6ac6802730a30c606fc43b Mon Sep 17 00:00:00 2001
From: David Kilroy <kilroyd@googlemail.com>
Date: Sun, 25 Sep 2011 08:30:18 +0100
Subject: [PATCH] --- yaml --- r: 268546 b: refs/heads/master c:
 870634604e23e6ba011d17e9b10ab8f8ccc4f768 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/wlags49_h2/wl_wext.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 958ce2f3a888..9c583b209425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 589cabe1b13576b85419d73ba87e50f7f80463fb
+refs/heads/master: 870634604e23e6ba011d17e9b10ab8f8ccc4f768
diff --git a/trunk/drivers/staging/wlags49_h2/wl_wext.c b/trunk/drivers/staging/wlags49_h2/wl_wext.c
index 917c949fe591..80bd938bfc0f 100644
--- a/trunk/drivers/staging/wlags49_h2/wl_wext.c
+++ b/trunk/drivers/staging/wlags49_h2/wl_wext.c
@@ -523,15 +523,17 @@ static int wireless_get_range(struct net_device *dev, struct iw_request_info *in
 	DBG_TRACE( DbgInfo, "wl_wireless_stats done\n" );
 
 	/* Event capability (kernel + driver) */
-	range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
-				IW_EVENT_CAPA_MASK(SIOCGIWAP) |
-				IW_EVENT_CAPA_MASK(SIOCGIWSCAN));
-	range->event_capa[1] = IW_EVENT_CAPA_K_1;
-	range->event_capa[4] = (IW_EVENT_CAPA_MASK(IWEVREGISTERED) |
-				IW_EVENT_CAPA_MASK(IWEVCUSTOM) |
-				IW_EVENT_CAPA_MASK(IWEVEXPIRED));
+	IW_EVENT_CAPA_SET_KERNEL(range->event_capa);
+	IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
+	IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);
+	IW_EVENT_CAPA_SET(range->event_capa, IWEVREGISTERED);
+	IW_EVENT_CAPA_SET(range->event_capa, IWEVEXPIRED);
+	IW_EVENT_CAPA_SET(range->event_capa, IWEVMICHAELMICFAILURE);
+	IW_EVENT_CAPA_SET(range->event_capa, IWEVASSOCREQIE);
+	IW_EVENT_CAPA_SET(range->event_capa, IWEVASSOCRESPIE);
 
 	range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_CIPHER_TKIP;
+	range->scan_capa = IW_SCAN_CAPA_NONE;
 
 out_unlock:
     	wl_act_int_on( lp );