From b2bbe6c0376b5bc41c782d805a64ae172a38b548 Mon Sep 17 00:00:00 2001
From: James Ketrenos <jketreno@linux.intel.com>
Date: Wed, 21 Sep 2005 11:54:22 -0500
Subject: [PATCH] --- yaml --- r: 10242 b: refs/heads/master c:
 259bf1fd8a7cc0f6b47fd8a9ac5e2dfc33182a3d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/net/ieee80211.h      | 2 +-
 trunk/net/ieee80211/ieee80211_wx.c | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7057d10c2edc..97b4212a04f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ad0c3c64484b1458b51167bd3e614d8d9d070f8
+refs/heads/master: 259bf1fd8a7cc0f6b47fd8a9ac5e2dfc33182a3d
diff --git a/trunk/include/net/ieee80211.h b/trunk/include/net/ieee80211.h
index 6cc0674e5606..c7ab7cd9de13 100644
--- a/trunk/include/net/ieee80211.h
+++ b/trunk/include/net/ieee80211.h
@@ -439,7 +439,7 @@ struct ieee80211_device;
 #define SEC_UNICAST_GROUP	(1<<6)
 #define SEC_LEVEL		(1<<7)
 #define SEC_ENABLED		(1<<8)
-#define SEC_TGI_KEY_RESET	(1<<9)
+#define SEC_ENCRYPT		(1<<9)
 
 #define SEC_LEVEL_0		0	/* None */
 #define SEC_LEVEL_1		1	/* WEP 40 and 104 bit */
diff --git a/trunk/net/ieee80211/ieee80211_wx.c b/trunk/net/ieee80211/ieee80211_wx.c
index df64bf3716b7..49afea7989d0 100644
--- a/trunk/net/ieee80211/ieee80211_wx.c
+++ b/trunk/net/ieee80211/ieee80211_wx.c
@@ -322,7 +322,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
 			sec.enabled = 0;
 			sec.encrypt = 0;
 			sec.level = SEC_LEVEL_0;
-			sec.flags |= SEC_ENABLED | SEC_LEVEL;
+			sec.flags |= SEC_ENABLED | SEC_LEVEL | SEC_ENCRYPT;
 		}
 
 		goto done;
@@ -330,7 +330,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
 
 	sec.enabled = 1;
 	sec.encrypt = 1;
-	sec.flags |= SEC_ENABLED;
+	sec.flags |= SEC_ENABLED | SEC_ENCRYPT;
 
 	if (*crypt != NULL && (*crypt)->ops != NULL &&
 	    strcmp((*crypt)->ops->name, "WEP") != 0) {
@@ -412,8 +412,6 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
 			sec.flags |= SEC_ACTIVE_KEY;
 		}
 	}
-
-      done:
 	ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED);
 	sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
 	sec.flags |= SEC_AUTH_MODE;
@@ -425,6 +423,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
 	sec.flags |= SEC_LEVEL;
 	sec.level = SEC_LEVEL_1;	/* 40 and 104 bit WEP */
 
+      done:
 	if (ieee->set_security)
 		ieee->set_security(dev, &sec);