ieee80211-devel — List for discussing development of ieee80211 subsystem

[Ieee80211-devel] [PATCH 14/29] ieee80211 Fixed type-o of abg_ture -> abg_true

[James K. <jke...@li...>]

[PATCH 14/29] Fixed type-o of abg_ture -> abg_true.

Signed-off-by: James Ketrenos <jke...@li...>

NOTE: This patch requires drivers using abg_ture to be updated.

---

 include/net/ieee80211.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

152d1f196a83da2e2188f08892f4157ef9670826
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -714,7 +714,7 @@ struct ieee80211_device {
 	int mode;		/* A, B, G */
 	int modulation;		/* CCK, OFDM */
 	int freq_band;		/* 2.4Ghz, 5.2Ghz, Mixed */
-	int abg_ture;		/* ABG flag              */
+	int abg_true;		/* ABG flag              */
 
 	int perfect_rssi;
 	int worst_rssi;

[Ieee80211-devel] [PATCH 13/29] ieee80211 Added WE-18 support to default wireless extension handler

[James K. <jke...@li...>]

Added WE-18 support to default wireless extension handler in ieee80211
subsystem.

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h      |   14 ++
 net/ieee80211/ieee80211_wx.c |  238 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 244 insertions(+), 8 deletions(-)

659c4080ed30c8aaebc96d967dc83bcc2aae2c24
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -453,6 +453,11 @@ struct ieee80211_device;
 #define SEC_LEVEL_2_CKIP	3	/* Level 1 + CKIP */
 #define SEC_LEVEL_3		4	/* Level 2 + CCMP */
 
+#define SEC_ALG_NONE		0
+#define SEC_ALG_WEP		1
+#define SEC_ALG_TKIP		2
+#define SEC_ALG_CCMP		3
+
 #define WEP_KEYS		4
 #define WEP_KEY_LEN		13
 #define SCM_KEY_LEN		32
@@ -462,6 +467,7 @@ struct ieee80211_security {
 	u16 active_key:2,
 	    enabled:1,
 	    auth_mode:2, auth_algo:4, unicast_uses_group:1, encrypt:1;
+	u8 encode_alg[WEP_KEYS];
 	u8 key_sizes[WEP_KEYS];
 	u8 keys[WEP_KEYS][SCM_KEY_LEN];
 	u8 level;
@@ -830,6 +836,14 @@ extern int ieee80211_wx_set_encode(struc
 extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
 				   struct iw_request_info *info,
 				   union iwreq_data *wrqu, char *key);
+#if WIRELESS_EXT > 17
+extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
+				      struct iw_request_info *info,
+				      union iwreq_data *wrqu, char *extra);
+extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
+				      struct iw_request_info *info,
+				      union iwreq_data *wrqu, char *extra);
+#endif
 
 extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
 {
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -421,6 +421,7 @@ int ieee80211_wx_set_encode(struct ieee8
 	 * TODO: When WPA is added this is one place that needs to change */
 	sec.flags |= SEC_LEVEL;
 	sec.level = SEC_LEVEL_1;	/* 40 and 104 bit WEP */
+	sec.encode_alg[key] = SEC_ALG_WEP;
 
       done:
 	if (ieee->set_security)
@@ -468,14 +469,6 @@ int ieee80211_wx_get_encode(struct ieee8
 		return 0;
 	}
 
-	if (sec->level != SEC_LEVEL_1) {
-		/* only WEP is supported with wireless extensions, so just
-		 * report that encryption is used */
-		erq->length = 0;
-		erq->flags |= IW_ENCODE_ENABLED;
-		return 0;
-	}
-
 	len = sec->key_sizes[key];
 	memcpy(keybuf, sec->keys[key], len);
 
@@ -490,6 +483,235 @@ int ieee80211_wx_get_encode(struct ieee8
 	return 0;
 }
 
+#if WIRELESS_EXT > 17
+int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
+			       struct iw_request_info *info,
+			       union iwreq_data *wrqu, char *extra)
+{
+	struct net_device *dev = ieee->dev;
+	struct iw_point *encoding = &wrqu->encoding;
+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
+	int i, idx, ret = 0;
+	const char *alg, *module;
+	struct ieee80211_crypto_ops *ops;
+	struct ieee80211_crypt_data **crypt;
+
+	struct ieee80211_security sec = {
+		.flags = 0,
+	};
+
+	idx = encoding->flags & IW_ENCODE_INDEX;
+	if (idx) {
+		if (idx < 1 || idx > WEP_KEYS)
+			return -EINVAL;
+		idx--;
+	} else
+		idx = ieee->tx_keyidx;
+
+	if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)
+		crypt = &ieee->crypt[idx];
+	else {
+		if (idx != 0)
+			return -EINVAL;
+		if (ieee->iw_mode == IW_MODE_INFRA)
+			crypt = &ieee->crypt[idx];
+		else
+			return -EINVAL;
+	}
+
+	sec.flags |= SEC_ENABLED | SEC_ENCRYPT;
+	if ((encoding->flags & IW_ENCODE_DISABLED) ||
+	    ext->alg == IW_ENCODE_ALG_NONE) {
+		if (*crypt)
+			ieee80211_crypt_delayed_deinit(ieee, crypt);
+
+		for (i = 0; i < WEP_KEYS; i++)
+			if (ieee->crypt[i] != NULL)
+				break;
+
+		if (i == WEP_KEYS) {
+			sec.enabled = 0;
+			sec.encrypt = 0;
+			sec.level = SEC_LEVEL_0;
+			sec.flags |= SEC_LEVEL;
+		}
+		goto done;
+	}
+
+	sec.enabled = 1;
+	sec.encrypt = 1;
+
+	if (!(ieee->host_encrypt || ieee->host_decrypt))
+		goto skip_host_crypt;
+
+	switch (ext->alg) {
+	case IW_ENCODE_ALG_WEP:
+		alg = "WEP";
+		module = "ieee80211_crypt_wep";
+		break;
+	case IW_ENCODE_ALG_TKIP:
+		alg = "TKIP";
+		module = "ieee80211_crypt_tkip";
+		break;
+	case IW_ENCODE_ALG_CCMP:
+		alg = "CCMP";
+		module = "ieee80211_crypt_ccmp";
+		break;
+	default:
+		IEEE80211_DEBUG_WX("%s: unknown crypto alg %d\n",
+				   dev->name, ext->alg);
+		ret = -EINVAL;
+		goto done;
+	}
+
+	ops = ieee80211_get_crypto_ops(alg);
+	if (ops == NULL) {
+		request_module(module);
+		ops = ieee80211_get_crypto_ops(alg);
+	}
+	if (ops == NULL) {
+		IEEE80211_DEBUG_WX("%s: unknown crypto alg %d\n",
+				   dev->name, ext->alg);
+		ret = -EINVAL;
+		goto done;
+	}
+
+	if (*crypt == NULL || (*crypt)->ops != ops) {
+		struct ieee80211_crypt_data *new_crypt;
+
+		ieee80211_crypt_delayed_deinit(ieee, crypt);
+
+		new_crypt = (struct ieee80211_crypt_data *)
+		    kmalloc(sizeof(*new_crypt), GFP_KERNEL);
+		if (new_crypt == NULL) {
+			ret = -ENOMEM;
+			goto done;
+		}
+		memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+		new_crypt->ops = ops;
+		if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
+			new_crypt->priv = new_crypt->ops->init(idx);
+		if (new_crypt->priv == NULL) {
+			kfree(new_crypt);
+			ret = -EINVAL;
+			goto done;
+		}
+		*crypt = new_crypt;
+	}
+
+	if (ext->key_len > 0 && (*crypt)->ops->set_key &&
+	    (*crypt)->ops->set_key(ext->key, ext->key_len, ext->rx_seq,
+				   (*crypt)->priv) < 0) {
+		IEEE80211_DEBUG_WX("%s: key setting failed\n", dev->name);
+		ret = -EINVAL;
+		goto done;
+	}
+
+      skip_host_crypt:
+	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
+		ieee->tx_keyidx = idx;
+		sec.active_key = idx;
+		sec.flags |= SEC_ACTIVE_KEY;
+	}
+
+	if (ext->alg != IW_ENCODE_ALG_NONE) {
+		memcpy(sec.keys[idx], ext->key, ext->key_len);
+		sec.key_sizes[idx] = ext->key_len;
+		sec.flags |= (1 << idx);
+		if (ext->alg == IW_ENCODE_ALG_WEP) {
+			sec.encode_alg[idx] = SEC_ALG_WEP;
+			sec.flags |= SEC_LEVEL;
+			sec.level = SEC_LEVEL_1;
+		} else if (ext->alg == IW_ENCODE_ALG_TKIP) {
+			sec.encode_alg[idx] = SEC_ALG_TKIP;
+			sec.flags |= SEC_LEVEL;
+			sec.level = SEC_LEVEL_2;
+		} else if (ext->alg == IW_ENCODE_ALG_CCMP) {
+			sec.encode_alg[idx] = SEC_ALG_CCMP;
+			sec.flags |= SEC_LEVEL;
+			sec.level = SEC_LEVEL_3;
+		}
+	}
+      done:
+	if (ieee->set_security)
+		ieee->set_security(ieee->dev, &sec);
+
+	/*
+	 * Do not reset port if card is in Managed mode since resetting will
+	 * generate new IEEE 802.11 authentication which may end up in looping
+	 * with IEEE 802.1X. If your hardware requires a reset after WEP
+	 * configuration (for example... Prism2), implement the reset_port in
+	 * the callbacks structures used to initialize the 802.11 stack.
+	 */
+	if (ieee->reset_on_keychange &&
+	    ieee->iw_mode != IW_MODE_INFRA &&
+	    ieee->reset_port && ieee->reset_port(dev)) {
+		IEEE80211_DEBUG_WX("%s: reset_port failed\n", dev->name);
+		return -EINVAL;
+	}
+
+	return ret;
+}
+
+int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
+			       struct iw_request_info *info,
+			       union iwreq_data *wrqu, char *extra)
+{
+	struct iw_point *encoding = &wrqu->encoding;
+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
+	struct ieee80211_security *sec = &ieee->sec;
+	int idx, max_key_len;
+
+	max_key_len = encoding->length - sizeof(*ext);
+	if (max_key_len < 0)
+		return -EINVAL;
+
+	idx = encoding->flags & IW_ENCODE_INDEX;
+	if (idx) {
+		if (idx < 1 || idx > WEP_KEYS)
+			return -EINVAL;
+		idx--;
+	} else
+		idx = ieee->tx_keyidx;
+
+	if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)
+		if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA)
+			return -EINVAL;
+
+	encoding->flags = idx + 1;
+	memset(ext, 0, sizeof(*ext));
+
+	if (!sec->enabled) {
+		ext->alg = IW_ENCODE_ALG_NONE;
+		ext->key_len = 0;
+		encoding->flags |= IW_ENCODE_DISABLED;
+	} else {
+		if (sec->encode_alg[idx] == SEC_ALG_WEP)
+			ext->alg = IW_ENCODE_ALG_WEP;
+		else if (sec->encode_alg[idx] == SEC_ALG_TKIP)
+			ext->alg = IW_ENCODE_ALG_TKIP;
+		else if (sec->encode_alg[idx] == SEC_ALG_CCMP)
+			ext->alg = IW_ENCODE_ALG_CCMP;
+		else
+			return -EINVAL;
+
+		ext->key_len = sec->key_sizes[idx];
+		memcpy(ext->key, sec->keys[idx], ext->key_len);
+		encoding->flags |= IW_ENCODE_ENABLED;
+		if (ext->key_len &&
+		    (ext->alg == IW_ENCODE_ALG_TKIP ||
+		     ext->alg == IW_ENCODE_ALG_CCMP))
+			ext->ext_flags |= IW_ENCODE_EXT_TX_SEQ_VALID;
+
+	}
+
+	return 0;
+}
+
+EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
+EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
+#endif
+
 EXPORT_SYMBOL(ieee80211_wx_get_scan);
 EXPORT_SYMBOL(ieee80211_wx_set_encode);
 EXPORT_SYMBOL(ieee80211_wx_get_encode);

[Ieee80211-devel] [PATCH 12/29] ieee80211 Allow drivers to fix an issue when using wpa_supplicant with WEP

[James K. <jke...@li...>]

Allow drivers to fix an issue when using wpa_supplicant with WEP.

The problem is introduced by the hwcrypto patch. We changed indicator of
the encryption request from the upper layer (i.e. wpa_supplicant):

In the original host based crypto the driver could use: crypt &&
crypt->ops.

In the new hardware based crypto, the driver should use the flags
specified in ieee->sec.encrypt.

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h      |    2 +-
 net/ieee80211/ieee80211_wx.c |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

3f21eea347f9f098214a619fb734f038b9e5ec1f
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -445,7 +445,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/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -321,7 +321,7 @@ int ieee80211_wx_set_encode(struct ieee8
 			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;
@@ -329,7 +329,7 @@ int ieee80211_wx_set_encode(struct ieee8
 
 	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) {
@@ -411,8 +411,6 @@ int ieee80211_wx_set_encode(struct ieee8
 			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;
@@ -424,6 +422,7 @@ int ieee80211_wx_set_encode(struct ieee8
 	sec.flags |= SEC_LEVEL;
 	sec.level = SEC_LEVEL_1;	/* 40 and 104 bit WEP */
 
+      done:
 	if (ieee->set_security)
 		ieee->set_security(dev, &sec);
 

[Ieee80211-devel] [PATCH 11/29] ieee80211 Fix kernel Oops when module unload

[James K. <jke...@li...>]

Fix kernel Oops when module unload.

Export a new function ieee80211_crypt_quiescing from ieee80211. Device
drivers call it to make the host crypto stack enter the quiescence
state, which means "process existing requests, but don't accept new
ones". This is usually called during a driver's host crypto data
structure free (module unload) path.

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h          |    1 +
 include/net/ieee80211_crypt.h    |    1 +
 net/ieee80211/ieee80211_crypt.c  |   33 +++++++++++++++++++++++++++------
 net/ieee80211/ieee80211_module.c |    2 ++
 4 files changed, 31 insertions(+), 6 deletions(-)

5cbc4873625d8a6d4d5dbeec354c4277f4b11213
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -690,6 +690,7 @@ struct ieee80211_device {
 	struct ieee80211_crypt_data *crypt[WEP_KEYS];
 	int tx_keyidx;		/* default TX key index (crypt[tx_keyidx]) */
 	struct timer_list crypt_deinit_timer;
+	int crypt_quiesced;
 
 	int bcrx_sta_key;	/* use individual keys to override default keys even
 				 * with RX of broad/multicast frames */
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -100,5 +100,6 @@ void ieee80211_crypt_deinit_entries(stru
 void ieee80211_crypt_deinit_handler(unsigned long);
 void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
 				    struct ieee80211_crypt_data **crypt);
+void ieee80211_crypt_quiescing(struct ieee80211_device *ieee);
 
 #endif
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -44,6 +44,10 @@ void ieee80211_crypt_deinit_entries(stru
 	unsigned long flags;
 
 	spin_lock_irqsave(&ieee->lock, flags);
+
+	if (list_empty(&ieee->crypt_deinit_list))
+		goto unlock;
+
 	for (ptr = ieee->crypt_deinit_list.next, n = ptr->next;
 	     ptr != &ieee->crypt_deinit_list; ptr = n, n = ptr->next) {
 		entry = list_entry(ptr, struct ieee80211_crypt_data, list);
@@ -59,21 +63,35 @@ void ieee80211_crypt_deinit_entries(stru
 		}
 		kfree(entry);
 	}
+      unlock:
+	spin_unlock_irqrestore(&ieee->lock, flags);
+}
+
+/* After this, crypt_deinit_list won't accept new members */
+void ieee80211_crypt_quiescing(struct ieee80211_device *ieee)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&ieee->lock, flags);
+	ieee->crypt_quiesced = 1;
 	spin_unlock_irqrestore(&ieee->lock, flags);
 }
 
 void ieee80211_crypt_deinit_handler(unsigned long data)
 {
 	struct ieee80211_device *ieee = (struct ieee80211_device *)data;
+	unsigned long flags;
 
 	ieee80211_crypt_deinit_entries(ieee, 0);
-	if (!list_empty(&ieee->crypt_deinit_list)) {
+
+	spin_lock_irqsave(&ieee->lock, flags);
+	if (!list_empty(&ieee->crypt_deinit_list) && !ieee->crypt_quiesced) {
 		printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
 		       "deletion list\n", ieee->dev->name);
 		ieee->crypt_deinit_timer.expires = jiffies + HZ;
 		add_timer(&ieee->crypt_deinit_timer);
 	}
-
+	spin_unlock_irqrestore(&ieee->lock, flags);
 }
 
 void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
@@ -93,10 +111,12 @@ void ieee80211_crypt_delayed_deinit(stru
 	 * locking. */
 
 	spin_lock_irqsave(&ieee->lock, flags);
-	list_add(&tmp->list, &ieee->crypt_deinit_list);
-	if (!timer_pending(&ieee->crypt_deinit_timer)) {
-		ieee->crypt_deinit_timer.expires = jiffies + HZ;
-		add_timer(&ieee->crypt_deinit_timer);
+	if (!ieee->crypt_quiesced) {
+		list_add(&tmp->list, &ieee->crypt_deinit_list);
+		if (!timer_pending(&ieee->crypt_deinit_timer)) {
+			ieee->crypt_deinit_timer.expires = jiffies + HZ;
+			add_timer(&ieee->crypt_deinit_timer);
+		}
 	}
 	spin_unlock_irqrestore(&ieee->lock, flags);
 }
@@ -249,6 +269,7 @@ static void __exit ieee80211_crypto_dein
 EXPORT_SYMBOL(ieee80211_crypt_deinit_entries);
 EXPORT_SYMBOL(ieee80211_crypt_deinit_handler);
 EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit);
+EXPORT_SYMBOL(ieee80211_crypt_quiescing);
 
 EXPORT_SYMBOL(ieee80211_register_crypto_ops);
 EXPORT_SYMBOL(ieee80211_unregister_crypto_ops);
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -138,6 +138,7 @@ struct net_device *alloc_ieee80211(int s
 	init_timer(&ieee->crypt_deinit_timer);
 	ieee->crypt_deinit_timer.data = (unsigned long)ieee;
 	ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler;
+	ieee->crypt_quiesced = 0;
 
 	spin_lock_init(&ieee->lock);
 
@@ -161,6 +162,7 @@ void free_ieee80211(struct net_device *d
 
 	int i;
 
+	ieee80211_crypt_quiescing(ieee);
 	del_timer_sync(&ieee->crypt_deinit_timer);
 	ieee80211_crypt_deinit_entries(ieee, 1);
 

[Ieee80211-devel] [PATCH 10/29] ieee80211 Fix time calculation

[James K. <jke...@li...>]

Fix time calculation. HZ is 1000 on 2.6 i386 kernel, but we don't
calculate time bases on this. We calculate time bases on (jiffies ==
1/HZ).

Signed-off-by: James Ketrenos <jke...@li...>

---

 net/ieee80211/ieee80211_wx.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

2031aedbdd7916288274e7bd95affe9548c3239e
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -218,7 +218,7 @@ static inline char *ipw2100_translate_sc
 	p = custom;
 	p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
 		      " Last beacon: %lums ago",
-		      (jiffies - network->last_scanned) / (HZ / 100));
+		      1000 * (jiffies - network->last_scanned) / HZ);
 	iwe.u.data.length = p - custom;
 	if (iwe.u.data.length)
 		start = iwe_stream_add_point(start, stop, &iwe, custom);
@@ -252,9 +252,9 @@ int ieee80211_wx_get_scan(struct ieee802
 					     escape_essid(network->ssid,
 							  network->ssid_len),
 					     MAC_ARG(network->bssid),
-					     (jiffies -
-					      network->last_scanned) / (HZ /
-									100));
+					     1000 * (jiffies -
+						     network->last_scanned) /
+					     HZ);
 	}
 
 	spin_unlock_irqrestore(&ieee->lock, flags);

[Ieee80211-devel] [PATCH 9/29] ieee80211 Switched to sscanf in store_debug_level

[James K. <jke...@li...>]

Switched to sscanf as per friendly comment in store_debug_level.

Signed-off-by: James Ketrenos <jke...@li...>

---

 net/ieee80211/ieee80211_module.c |   26 ++++++--------------------
 1 files changed, 6 insertions(+), 20 deletions(-)

dc8a16beb9df994701fb24bbc621e7584c50a541
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -195,34 +195,20 @@ static int show_debug_level(char *page, 
 static int store_debug_level(struct file *file, const char __user * buffer,
 			     unsigned long count, void *data)
 {
-	char buf[] = "0x00000000";
-	char *p = (char *)buf;
+	char buf[] = "0x00000000\n";
+	unsigned long len = min((unsigned long)sizeof(buf) - 1, count);
 	unsigned long val;
 
-	if (count > sizeof(buf) - 1)
-		count = sizeof(buf) - 1;
-
-	if (copy_from_user(buf, buffer, count))
+	if (copy_from_user(buf, buffer, len))
 		return count;
-	buf[count] = 0;
-	/*
-	 * what a FPOS...  What, sscanf(buf, "%i", &val) would be too
-	 * scary?
-	 */
-	if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
-		p++;
-		if (p[0] == 'x' || p[0] == 'X')
-			p++;
-		val = simple_strtoul(p, &p, 16);
-	} else
-		val = simple_strtoul(p, &p, 10);
-	if (p == buf)
+	buf[len] = 0;
+	if (sscanf(buf, "%li", &val) != 1)
 		printk(KERN_INFO DRV_NAME
 		       ": %s is not in hex or decimal form.\n", buf);
 	else
 		ieee80211_debug_level = val;
 
-	return strlen(buf);
+	return strnlen(buf, len);
 }
 
 static int __init ieee80211_init(void)

[Ieee80211-devel] [PATCH 8/29] ieee80211 Cleanup memcpy parameters.

[James K. <jke...@li...>]

Cleanup memcpy parameters.

Signed-off-by: James Ketrenos <jke...@li...>

---

 net/ieee80211/ieee80211_tx.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

34aec53d7c891262b15ec99b0eae56fdf90e7645
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -286,8 +286,8 @@ int ieee80211_xmit(struct sk_buff *skb, 
 	}
 
 	/* Save source and destination addresses */
-	memcpy(&dest, skb->data, ETH_ALEN);
-	memcpy(&src, skb->data + ETH_ALEN, ETH_ALEN);
+	memcpy(dest, skb->data, ETH_ALEN);
+	memcpy(src, skb->data + ETH_ALEN, ETH_ALEN);
 
 	/* Advance the SKB to the start of the payload */
 	skb_pull(skb, sizeof(struct ethhdr));
@@ -305,15 +305,15 @@ int ieee80211_xmit(struct sk_buff *skb, 
 		fc |= IEEE80211_FCTL_TODS;
 		/* To DS: Addr1 = BSSID, Addr2 = SA,
 		   Addr3 = DA */
-		memcpy(&header.addr1, ieee->bssid, ETH_ALEN);
-		memcpy(&header.addr2, &src, ETH_ALEN);
-		memcpy(&header.addr3, &dest, ETH_ALEN);
+		memcpy(header.addr1, ieee->bssid, ETH_ALEN);
+		memcpy(header.addr2, src, ETH_ALEN);
+		memcpy(header.addr3, dest, ETH_ALEN);
 	} else if (ieee->iw_mode == IW_MODE_ADHOC) {
 		/* not From/To DS: Addr1 = DA, Addr2 = SA,
 		   Addr3 = BSSID */
-		memcpy(&header.addr1, dest, ETH_ALEN);
-		memcpy(&header.addr2, src, ETH_ALEN);
-		memcpy(&header.addr3, ieee->bssid, ETH_ALEN);
+		memcpy(header.addr1, dest, ETH_ALEN);
+		memcpy(header.addr2, src, ETH_ALEN);
+		memcpy(header.addr3, ieee->bssid, ETH_ALEN);
 	}
 	header.frame_ctl = cpu_to_le16(fc);
 	hdr_len = IEEE80211_3ADDR_LEN;

[Ieee80211-devel] [PATCH 7/29] Hardware crypto and fragmentation offload support added

[James K. <jke...@li...>]

Hardware crypto and fragmentation offload support added (Zhu Yi)

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h      |   46 +++++++++++++++++++++------------------
 net/ieee80211/ieee80211_tx.c |   27 ++++++++++++++++++-----
 net/ieee80211/ieee80211_wx.c |   50 ++++++++++++++++++++++++------------------
 3 files changed, 75 insertions(+), 48 deletions(-)

75cabcc3ca53d553d281d5b38123913186dbcfad
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -436,31 +436,34 @@ struct ieee80211_device;
 
 #include "ieee80211_crypt.h"
 
-#define SEC_KEY_1         (1<<0)
-#define SEC_KEY_2         (1<<1)
-#define SEC_KEY_3         (1<<2)
-#define SEC_KEY_4         (1<<3)
-#define SEC_KEY_MASK      (SEC_KEY_1 | SEC_KEY_2 | SEC_KEY_3 | SEC_KEY_4)
-#define SEC_ACTIVE_KEY    (1<<4)
-#define SEC_AUTH_MODE     (1<<5)
-#define SEC_UNICAST_GROUP (1<<6)
-#define SEC_LEVEL         (1<<7)
-#define SEC_ENABLED       (1<<8)
-
-#define SEC_LEVEL_0      0	/* None */
-#define SEC_LEVEL_1      1	/* WEP 40 and 104 bit */
-#define SEC_LEVEL_2      2	/* Level 1 + TKIP */
-#define SEC_LEVEL_2_CKIP 3	/* Level 1 + CKIP */
-#define SEC_LEVEL_3      4	/* Level 2 + CCMP */
-
-#define WEP_KEYS 4
-#define WEP_KEY_LEN 13
+#define SEC_KEY_1		(1<<0)
+#define SEC_KEY_2		(1<<1)
+#define SEC_KEY_3		(1<<2)
+#define SEC_KEY_4		(1<<3)
+#define SEC_ACTIVE_KEY		(1<<4)
+#define SEC_AUTH_MODE		(1<<5)
+#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_LEVEL_0		0	/* None */
+#define SEC_LEVEL_1		1	/* WEP 40 and 104 bit */
+#define SEC_LEVEL_2		2	/* Level 1 + TKIP */
+#define SEC_LEVEL_2_CKIP	3	/* Level 1 + CKIP */
+#define SEC_LEVEL_3		4	/* Level 2 + CCMP */
+
+#define WEP_KEYS		4
+#define WEP_KEY_LEN		13
+#define SCM_KEY_LEN		32
+#define SCM_TEMPORAL_KEY_LENGTH	16
 
 struct ieee80211_security {
 	u16 active_key:2,
-	    enabled:1, auth_mode:2, auth_algo:4, unicast_uses_group:1;
+	    enabled:1,
+	    auth_mode:2, auth_algo:4, unicast_uses_group:1, encrypt:1;
 	u8 key_sizes[WEP_KEYS];
-	u8 keys[WEP_KEYS][WEP_KEY_LEN];
+	u8 keys[WEP_KEYS][SCM_KEY_LEN];
 	u8 level;
 	u16 flags;
 } __attribute__ ((packed));
@@ -642,6 +645,7 @@ enum ieee80211_state {
 
 struct ieee80211_device {
 	struct net_device *dev;
+	struct ieee80211_security sec;
 
 	/* Bookkeeping structures */
 	struct net_device_stats stats;
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -245,7 +245,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
 	int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size;
 	unsigned long flags;
 	struct net_device_stats *stats = &ieee->stats;
-	int ether_type, encrypt;
+	int ether_type, encrypt, host_encrypt;
 	int bytes, fc, hdr_len;
 	struct sk_buff *skb_frag;
 	struct ieee80211_hdr header = {	/* Ensure zero initialized */
@@ -276,7 +276,8 @@ int ieee80211_xmit(struct sk_buff *skb, 
 	crypt = ieee->crypt[ieee->tx_keyidx];
 
 	encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) &&
-	    ieee->host_encrypt && crypt && crypt->ops;
+	    ieee->sec.encrypt;
+	host_encrypt = ieee->host_encrypt && encrypt;
 
 	if (!encrypt && ieee->ieee802_1x &&
 	    ieee->drop_unencrypted && ether_type != ETH_P_PAE) {
@@ -294,7 +295,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
 	/* Determine total amount of storage required for TXB packets */
 	bytes = skb->len + SNAP_SIZE + sizeof(u16);
 
-	if (encrypt)
+	if (host_encrypt)
 		fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
 		    IEEE80211_FCTL_PROTECTED;
 	else
@@ -334,7 +335,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
 		bytes_per_frag -= IEEE80211_FCS_LEN;
 
 	/* Each fragment may need to have room for encryptiong pre/postfix */
-	if (encrypt)
+	if (host_encrypt)
 		bytes_per_frag -= crypt->ops->extra_prefix_len +
 		    crypt->ops->extra_postfix_len;
 
@@ -362,7 +363,7 @@ int ieee80211_xmit(struct sk_buff *skb, 
 	for (i = 0; i < nr_frags; i++) {
 		skb_frag = txb->fragments[i];
 
-		if (encrypt)
+		if (host_encrypt)
 			skb_reserve(skb_frag, crypt->ops->extra_prefix_len);
 
 		frag_hdr = (struct ieee80211_hdr *)skb_put(skb_frag, hdr_len);
@@ -394,8 +395,22 @@ int ieee80211_xmit(struct sk_buff *skb, 
 
 		/* Encryption routine will move the header forward in order
 		 * to insert the IV between the header and the payload */
-		if (encrypt)
+		if (host_encrypt)
 			ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
+
+		/* ipw2200/2915 Hardware encryption doesn't support TKIP MIC */
+		if (!ieee->host_encrypt && encrypt &&
+		    (ieee->sec.level == SEC_LEVEL_2) &&
+		    crypt && crypt->ops && crypt->ops->encrypt_msdu) {
+			int res = 0;
+			res = crypt->ops->encrypt_msdu(skb_frag, hdr_len,
+						       crypt->priv);
+			if (res < 0) {
+				IEEE80211_ERROR("TKIP MIC encryption failed\n");
+				goto failed;
+			}
+		}
+
 		if (ieee->config &
 		    (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
 			skb_put(skb_frag, 4);
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -278,6 +278,7 @@ int ieee80211_wx_set_encode(struct ieee8
 	};
 	int i, key, key_provided, len;
 	struct ieee80211_crypt_data **crypt;
+	int host_crypto = ieee->host_encrypt || ieee->host_decrypt;
 
 	IEEE80211_DEBUG_WX("SET_ENCODE\n");
 
@@ -318,6 +319,7 @@ int ieee80211_wx_set_encode(struct ieee8
 
 		if (i == WEP_KEYS) {
 			sec.enabled = 0;
+			sec.encrypt = 0;
 			sec.level = SEC_LEVEL_0;
 			sec.flags |= SEC_ENABLED | SEC_LEVEL;
 		}
@@ -326,6 +328,7 @@ int ieee80211_wx_set_encode(struct ieee8
 	}
 
 	sec.enabled = 1;
+	sec.encrypt = 1;
 	sec.flags |= SEC_ENABLED;
 
 	if (*crypt != NULL && (*crypt)->ops != NULL &&
@@ -335,7 +338,7 @@ int ieee80211_wx_set_encode(struct ieee8
 		ieee80211_crypt_delayed_deinit(ieee, crypt);
 	}
 
-	if (*crypt == NULL) {
+	if (*crypt == NULL && host_crypto) {
 		struct ieee80211_crypt_data *new_crypt;
 
 		/* take WEP into use */
@@ -375,31 +378,34 @@ int ieee80211_wx_set_encode(struct ieee8
 				   key, escape_essid(sec.keys[key], len),
 				   erq->length, len);
 		sec.key_sizes[key] = len;
-		(*crypt)->ops->set_key(sec.keys[key], len, NULL,
-				       (*crypt)->priv);
+		if (*crypt)
+			(*crypt)->ops->set_key(sec.keys[key], len, NULL,
+					       (*crypt)->priv);
 		sec.flags |= (1 << key);
 		/* This ensures a key will be activated if no key is
 		 * explicitely set */
 		if (key == sec.active_key)
 			sec.flags |= SEC_ACTIVE_KEY;
+
 	} else {
-		len = (*crypt)->ops->get_key(sec.keys[key], WEP_KEY_LEN,
-					     NULL, (*crypt)->priv);
-		if (len == 0) {
-			/* Set a default key of all 0 */
-			IEEE80211_DEBUG_WX("Setting key %d to all zero.\n",
-					   key);
-			memset(sec.keys[key], 0, 13);
-			(*crypt)->ops->set_key(sec.keys[key], 13, NULL,
-					       (*crypt)->priv);
-			sec.key_sizes[key] = 13;
-			sec.flags |= (1 << key);
+		if (host_crypto) {
+			len = (*crypt)->ops->get_key(sec.keys[key], WEP_KEY_LEN,
+						     NULL, (*crypt)->priv);
+			if (len == 0) {
+				/* Set a default key of all 0 */
+				IEEE80211_DEBUG_WX("Setting key %d to all "
+						   "zero.\n", key);
+				memset(sec.keys[key], 0, 13);
+				(*crypt)->ops->set_key(sec.keys[key], 13, NULL,
+						       (*crypt)->priv);
+				sec.key_sizes[key] = 13;
+				sec.flags |= (1 << key);
+			}
 		}
-
 		/* No key data - just set the default TX key index */
 		if (key_provided) {
-			IEEE80211_DEBUG_WX
-			    ("Setting key %d to default Tx key.\n", key);
+			IEEE80211_DEBUG_WX("Setting key %d to default Tx "
+					   "key.\n", key);
 			ieee->tx_keyidx = key;
 			sec.active_key = key;
 			sec.flags |= SEC_ACTIVE_KEY;
@@ -442,6 +448,7 @@ int ieee80211_wx_get_encode(struct ieee8
 	struct iw_point *erq = &(wrqu->encoding);
 	int len, key;
 	struct ieee80211_crypt_data *crypt;
+	struct ieee80211_security *sec = &ieee->sec;
 
 	IEEE80211_DEBUG_WX("GET_ENCODE\n");
 
@@ -456,13 +463,13 @@ int ieee80211_wx_get_encode(struct ieee8
 	crypt = ieee->crypt[key];
 	erq->flags = key + 1;
 
-	if (crypt == NULL || crypt->ops == NULL) {
+	if (!sec->enabled) {
 		erq->length = 0;
 		erq->flags |= IW_ENCODE_DISABLED;
 		return 0;
 	}
 
-	if (strcmp(crypt->ops->name, "WEP") != 0) {
+	if (sec->level != SEC_LEVEL_1) {
 		/* only WEP is supported with wireless extensions, so just
 		 * report that encryption is used */
 		erq->length = 0;
@@ -470,9 +477,10 @@ int ieee80211_wx_get_encode(struct ieee8
 		return 0;
 	}
 
-	len = crypt->ops->get_key(keybuf, WEP_KEY_LEN, NULL, crypt->priv);
-	erq->length = (len >= 0 ? len : 0);
+	len = sec->key_sizes[key];
+	memcpy(keybuf, sec->keys[key], len);
 
+	erq->length = (len >= 0 ? len : 0);
 	erq->flags |= IW_ENCODE_ENABLED;
 
 	if (ieee->open_wep)

[Ieee80211-devel] [PATCH 6/29] ieee80211 Removed ieee80211_info_element_hdr

[James K. <jke...@li...>]

Removed ieee80211_info_element_hdr structure as ieee80211_info_element
provides the same use.

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h      |    5 -----
 net/ieee80211/ieee80211_rx.c |   10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

8574b9aed2357608fc76d5d821e34ed8782cb31a
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -512,11 +512,6 @@ enum ieee80211_mfie {
 	MFIE_TYPE_GENERIC = 221,
 };
 
-struct ieee80211_info_element_hdr {
-	u8 id;
-	u8 len;
-} __attribute__ ((packed));
-
 struct ieee80211_info_element {
 	u8 id;
 	u8 len;
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -823,10 +823,10 @@ static inline int ieee80211_network_init
 	network->rsn_ie_len = 0;
 
 	info_element = beacon->info_element;
-	left = stats->len - ((void *)info_element - (void *)beacon);
-	while (left >= sizeof(struct ieee80211_info_element_hdr)) {
-		if (sizeof(struct ieee80211_info_element_hdr) +
-		    info_element->len > left) {
+	left = stats->len - sizeof(*beacon);
+	while (left >= sizeof(struct ieee80211_info_element)) {
+		if (sizeof(struct ieee80211_info_element) + info_element->len >
+		    left) {
 			IEEE80211_DEBUG_SCAN
 			    ("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n",
 			     info_element->len +
@@ -967,7 +967,7 @@ static inline int ieee80211_network_init
 			break;
 		}
 
-		left -= sizeof(struct ieee80211_info_element_hdr) +
+		left -= sizeof(struct ieee80211_info_element) +
 		    info_element->len;
 		info_element = (struct ieee80211_info_element *)
 		    &info_element->data[info_element->len];

[Ieee80211-devel] [PATCH 5/29] Changed 802.11 headers to use ieee80211_info_element[0]

[James K. <jke...@li...>]

Changed 802.11 headers to use ieee80211_info_element as zero sized
array so that sizeof calculations do not account for IE sizes.

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h      |    8 ++++----
 net/ieee80211/ieee80211_rx.c |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

563025a73daf8f4b8c14d879f38627d0a51bbbad
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -545,7 +545,7 @@ struct ieee80211_authentication {
 	__le16 algorithm;
 	__le16 transaction;
 	__le16 status;
-	struct ieee80211_info_element info_element;
+	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
 struct ieee80211_probe_response {
@@ -553,14 +553,14 @@ struct ieee80211_probe_response {
 	u32 time_stamp[2];
 	__le16 beacon_interval;
 	__le16 capability;
-	struct ieee80211_info_element info_element;
+	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
 struct ieee80211_assoc_request_frame {
 	__le16 capability;
 	__le16 listen_interval;
 	u8 current_ap[ETH_ALEN];
-	struct ieee80211_info_element info_element;
+	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
 struct ieee80211_assoc_response_frame {
@@ -568,7 +568,7 @@ struct ieee80211_assoc_response_frame {
 	__le16 capability;
 	__le16 status;
 	__le16 aid;
-	struct ieee80211_info_element info_element;	/* supported rates */
+	struct ieee80211_info_element info_element[0];	/* supported rates */
 } __attribute__ ((packed));
 
 struct ieee80211_txb {
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -822,7 +822,7 @@ static inline int ieee80211_network_init
 	network->wpa_ie_len = 0;
 	network->rsn_ie_len = 0;
 
-	info_element = &beacon->info_element;
+	info_element = beacon->info_element;
 	left = stats->len - ((void *)info_element - (void *)beacon);
 	while (left >= sizeof(struct ieee80211_info_element_hdr)) {
 		if (sizeof(struct ieee80211_info_element_hdr) +
@@ -1050,7 +1050,7 @@ static inline void ieee80211_process_pro
 	struct ieee80211_network *target;
 	struct ieee80211_network *oldest = NULL;
 #ifdef CONFIG_IEEE80211_DEBUG
-	struct ieee80211_info_element *info_element = &beacon->info_element;
+	struct ieee80211_info_element *info_element = beacon->info_element;
 #endif
 	unsigned long flags;
 

[Ieee80211-devel] [PATCH 4/29] ieee80211 Fixes kernel oops on module unload

[James K. <jke...@li...>]

Fixed a kernel oops on module unload by adding spin lock protection to
ieee80211's crypt handlers (thanks to Zhu Yi)

Modified scan result logic to report WPA and RSN IEs if set (vs.being
based on wpa_enabled)

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h         |    7 +++++++
 include/net/ieee80211_crypt.h   |   18 ++++++++++++++++++
 net/ieee80211/ieee80211_crypt.c |    6 +++---
 net/ieee80211/ieee80211_wx.c    |    4 ++--
 4 files changed, 30 insertions(+), 5 deletions(-)

797dee9362c95cb8a063b35a7cb5c3bd85cf97b1
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -24,6 +24,12 @@
 #include <linux/kernel.h>	/* ARRAY_SIZE */
 #include <linux/wireless.h>
 
+#ifdef CONFIG_IEEE80211_CRYPT_TKIP_MODULE
+#ifndef CONFIG_IEEE80211_CRYPT_TKIP
+#define CONFIG_IEEE80211_CRYPT_TKIP
+#endif
+#endif
+
 #define IEEE80211_DATA_LEN		2304
 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
    6.2.1.1.2.
@@ -434,6 +440,7 @@ struct ieee80211_device;
 #define SEC_KEY_2         (1<<1)
 #define SEC_KEY_3         (1<<2)
 #define SEC_KEY_4         (1<<3)
+#define SEC_KEY_MASK      (SEC_KEY_1 | SEC_KEY_2 | SEC_KEY_3 | SEC_KEY_4)
 #define SEC_ACTIVE_KEY    (1<<4)
 #define SEC_AUTH_MODE     (1<<5)
 #define SEC_UNICAST_GROUP (1<<6)
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -25,6 +25,24 @@
 
 #include <linux/skbuff.h>
 
+#ifdef CONFIG_IEEE80211_WPA_MODULE
+#ifndef CONFIG_IEEE80211_WPA
+#define CONFIG_IEEE80211_WPA
+#endif
+#endif
+
+#ifdef CONFIG_IEEE80211_CRYPT_CCMP_MODULE
+#ifndef CONFIG_IEEE80211_CRYPT_CCMP
+#define CONFIG_IEEE80211_CRYPT_CCMP
+#endif
+#endif
+
+#ifdef CONFIG_IEEE80211_CRYPT_TKIP_MODULE
+#ifndef CONFIG_IEEE80211_CRYPT_TKIP
+#define CONFIG_IEEE80211_CRYPT_TKIP
+#endif
+#endif
+
 struct ieee80211_crypto_ops {
 	const char *name;
 
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -41,7 +41,9 @@ void ieee80211_crypt_deinit_entries(stru
 {
 	struct list_head *ptr, *n;
 	struct ieee80211_crypt_data *entry;
+	unsigned long flags;
 
+	spin_lock_irqsave(&ieee->lock, flags);
 	for (ptr = ieee->crypt_deinit_list.next, n = ptr->next;
 	     ptr != &ieee->crypt_deinit_list; ptr = n, n = ptr->next) {
 		entry = list_entry(ptr, struct ieee80211_crypt_data, list);
@@ -57,14 +59,13 @@ void ieee80211_crypt_deinit_entries(stru
 		}
 		kfree(entry);
 	}
+	spin_unlock_irqrestore(&ieee->lock, flags);
 }
 
 void ieee80211_crypt_deinit_handler(unsigned long data)
 {
 	struct ieee80211_device *ieee = (struct ieee80211_device *)data;
-	unsigned long flags;
 
-	spin_lock_irqsave(&ieee->lock, flags);
 	ieee80211_crypt_deinit_entries(ieee, 0);
 	if (!list_empty(&ieee->crypt_deinit_list)) {
 		printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
@@ -72,7 +73,6 @@ void ieee80211_crypt_deinit_handler(unsi
 		ieee->crypt_deinit_timer.expires = jiffies + HZ;
 		add_timer(&ieee->crypt_deinit_timer);
 	}
-	spin_unlock_irqrestore(&ieee->lock, flags);
 
 }
 
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -182,7 +182,7 @@ static inline char *ipw2100_translate_sc
 	if (iwe.u.data.length)
 		start = iwe_stream_add_point(start, stop, &iwe, custom);
 
-	if (ieee->wpa_enabled && network->wpa_ie_len) {
+	if (network->wpa_ie_len) {
 		char buf[MAX_WPA_IE_LEN * 2 + 30];
 
 		u8 *p = buf;
@@ -197,7 +197,7 @@ static inline char *ipw2100_translate_sc
 		start = iwe_stream_add_point(start, stop, &iwe, buf);
 	}
 
-	if (ieee->wpa_enabled && network->rsn_ie_len) {
+	if (network->rsn_ie_len) {
 		char buf[MAX_WPA_IE_LEN * 2 + 30];
 
 		u8 *p = buf;

[Ieee80211-devel] [PATCH 3/29] ieee80211 Added wireless spy support

[James K. <jke...@li...>]

Added wireless spy support to Rx code path.

Signed-off-by: James Ketrenos <jke...@li...>

NOTE:  Looks like scripts/Lindent generated output different 
than the Lindented version already in-kernel, hence all the 
whitespace deltas...  *sigh*

---

 include/net/ieee80211.h              |  109 ++++++++++++++--------------------
 include/net/ieee80211_crypt.h        |   24 ++++---
 net/ieee80211/ieee80211_crypt.c      |   24 ++++---
 net/ieee80211/ieee80211_crypt_ccmp.c |   26 ++++----
 net/ieee80211/ieee80211_crypt_tkip.c |   26 ++++----
 net/ieee80211/ieee80211_crypt_wep.c  |   26 ++++----
 net/ieee80211/ieee80211_rx.c         |   43 ++++++++-----
 7 files changed, 134 insertions(+), 144 deletions(-)

a5a53bc36a3d0aa479d420b249b587289239c1cf
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -20,8 +20,8 @@
  */
 #ifndef IEEE80211_H
 #define IEEE80211_H
-#include <linux/if_ether.h> /* ETH_ALEN */
-#include <linux/kernel.h>   /* ARRAY_SIZE */
+#include <linux/if_ether.h>	/* ETH_ALEN */
+#include <linux/kernel.h>	/* ARRAY_SIZE */
 #include <linux/wireless.h>
 
 #define IEEE80211_DATA_LEN		2304
@@ -33,7 +33,6 @@
    represents the 2304 bytes of real data, plus a possible 8 bytes of
    WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
 
-
 #define IEEE80211_HLEN			30
 #define IEEE80211_FRAME_LEN		(IEEE80211_DATA_LEN + IEEE80211_HLEN)
 
@@ -117,7 +116,6 @@ struct ieee80211_hdr_3addr {
 #define IEEE80211_SCTL_FRAG		0x000F
 #define IEEE80211_SCTL_SEQ		0xFFF0
 
-
 /* debug macros */
 
 #ifdef CONFIG_IEEE80211_DEBUG
@@ -128,8 +126,7 @@ do { if (ieee80211_debug_level & (level)
          in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
 #else
 #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
-#endif	/* CONFIG_IEEE80211_DEBUG */
-
+#endif				/* CONFIG_IEEE80211_DEBUG */
 
 /* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
 
@@ -140,7 +137,6 @@ do { if (ieee80211_debug_level & (level)
  * messages. It should never be used for passing essid to user space. */
 const char *escape_essid(const char *essid, u8 essid_len);
 
-
 /*
  * To use the debug system:
  *
@@ -192,7 +188,7 @@ const char *escape_essid(const char *ess
 #define IEEE80211_DEBUG_RX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
-#include <linux/if_arp.h> /* ARPHRD_ETHER */
+#include <linux/if_arp.h>	/* ARPHRD_ETHER */
 
 #ifndef WIRELESS_SPY
 #define WIRELESS_SPY		/* enable iwspy support */
@@ -200,10 +196,10 @@ const char *escape_essid(const char *ess
 #include <net/iw_handler.h>	/* new driver API */
 
 #ifndef ETH_P_PAE
-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
-#endif /* ETH_P_PAE */
+#define ETH_P_PAE 0x888E	/* Port Access Entity (IEEE 802.1X) */
+#endif				/* ETH_P_PAE */
 
-#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */
+#define ETH_P_PREAUTH 0x88C7	/* IEEE 802.11i pre-authentication */
 
 #ifndef ETH_P_80211_RAW
 #define ETH_P_80211_RAW (ETH_P_ECONET + 1)
@@ -215,10 +211,10 @@ const char *escape_essid(const char *ess
 
 struct ieee80211_snap_hdr {
 
-        u8    dsap;   /* always 0xAA */
-        u8    ssap;   /* always 0xAA */
-        u8    ctrl;   /* always 0x03 */
-        u8    oui[P80211_OUI_LEN];    /* organizational universal id */
+	u8 dsap;		/* always 0xAA */
+	u8 ssap;		/* always 0xAA */
+	u8 ctrl;		/* always 0x03 */
+	u8 oui[P80211_OUI_LEN];	/* organizational universal id */
 
 } __attribute__ ((packed));
 
@@ -312,14 +308,12 @@ enum ieee80211_reasoncode {
 	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
 };
 
-
 #define IEEE80211_STATMASK_SIGNAL (1<<0)
 #define IEEE80211_STATMASK_RSSI (1<<1)
 #define IEEE80211_STATMASK_NOISE (1<<2)
 #define IEEE80211_STATMASK_RATE (1<<3)
 #define IEEE80211_STATMASK_WEMASK 0x7
 
-
 #define IEEE80211_CCK_MODULATION    (1<<0)
 #define IEEE80211_OFDM_MODULATION   (1<<1)
 
@@ -377,9 +371,6 @@ enum ieee80211_reasoncode {
 #define IEEE80211_NUM_CCK_RATES	            4
 #define IEEE80211_OFDM_SHIFT_MASK_A         4
 
-
-
-
 /* NOTE: This data is for statistical purposes; not all hardware provides this
  *       information for frames received.  Not setting these will not cause
  *       any adverse affects. */
@@ -388,7 +379,7 @@ struct ieee80211_rx_stats {
 	s8 rssi;
 	u8 signal;
 	u8 noise;
-	u16 rate; /* in 100 kbps */
+	u16 rate;		/* in 100 kbps */
 	u8 received_channel;
 	u8 control;
 	u8 mask;
@@ -449,28 +440,24 @@ struct ieee80211_device;
 #define SEC_LEVEL         (1<<7)
 #define SEC_ENABLED       (1<<8)
 
-#define SEC_LEVEL_0      0 /* None */
-#define SEC_LEVEL_1      1 /* WEP 40 and 104 bit */
-#define SEC_LEVEL_2      2 /* Level 1 + TKIP */
-#define SEC_LEVEL_2_CKIP 3 /* Level 1 + CKIP */
-#define SEC_LEVEL_3      4 /* Level 2 + CCMP */
+#define SEC_LEVEL_0      0	/* None */
+#define SEC_LEVEL_1      1	/* WEP 40 and 104 bit */
+#define SEC_LEVEL_2      2	/* Level 1 + TKIP */
+#define SEC_LEVEL_2_CKIP 3	/* Level 1 + CKIP */
+#define SEC_LEVEL_3      4	/* Level 2 + CCMP */
 
 #define WEP_KEYS 4
 #define WEP_KEY_LEN 13
 
 struct ieee80211_security {
 	u16 active_key:2,
-            enabled:1,
-	    auth_mode:2,
-            auth_algo:4,
-            unicast_uses_group:1;
+	    enabled:1, auth_mode:2, auth_algo:4, unicast_uses_group:1;
 	u8 key_sizes[WEP_KEYS];
 	u8 keys[WEP_KEYS][WEP_KEY_LEN];
 	u8 level;
 	u16 flags;
 } __attribute__ ((packed));
 
-
 /*
 
  802.11 data frame from AP
@@ -494,7 +481,7 @@ enum ieee80211_mfie {
 	MFIE_TYPE_RATES = 1,
 	MFIE_TYPE_FH_SET = 2,
 	MFIE_TYPE_DS_SET = 3,
-	MFIE_TYPE_CF_SET =  4,
+	MFIE_TYPE_CF_SET = 4,
 	MFIE_TYPE_TIM = 5,
 	MFIE_TYPE_IBSS_SET = 6,
 	MFIE_TYPE_COUNTRY = 7,
@@ -554,7 +541,6 @@ struct ieee80211_authentication {
 	struct ieee80211_info_element info_element;
 } __attribute__ ((packed));
 
-
 struct ieee80211_probe_response {
 	struct ieee80211_hdr_3addr header;
 	u32 time_stamp[2];
@@ -575,10 +561,9 @@ struct ieee80211_assoc_response_frame {
 	__le16 capability;
 	__le16 status;
 	__le16 aid;
-	struct ieee80211_info_element info_element; /* supported rates */
+	struct ieee80211_info_element info_element;	/* supported rates */
 } __attribute__ ((packed));
 
-
 struct ieee80211_txb {
 	u8 nr_frags;
 	u8 encrypted;
@@ -588,7 +573,6 @@ struct ieee80211_txb {
 	struct sk_buff *fragments[0];
 };
 
-
 /* SWEEP TABLE ENTRIES NUMBER */
 #define MAX_SWEEP_TAB_ENTRIES		  42
 #define MAX_SWEEP_TAB_ENTRIES_PER_PACKET  7
@@ -651,7 +635,6 @@ enum ieee80211_state {
 #define DEFAULT_MAX_SCAN_AGE (15 * HZ)
 #define DEFAULT_FTS 2346
 
-
 #define CFG_IEEE80211_RESERVE_FCS (1<<0)
 #define CFG_IEEE80211_COMPUTE_FCS (1<<1)
 
@@ -669,24 +652,25 @@ struct ieee80211_device {
 	int scans;
 	int scan_age;
 
-	int iw_mode; /* operating mode (IW_MODE_*) */
+	int iw_mode;		/* operating mode (IW_MODE_*) */
+	struct iw_spy_data spy_data;	/* iwspy support */
 
 	spinlock_t lock;
 
-	int tx_headroom; /* Set to size of any additional room needed at front
-			  * of allocated Tx SKBs */
+	int tx_headroom;	/* Set to size of any additional room needed at front
+				 * of allocated Tx SKBs */
 	u32 config;
 
 	/* WEP and other encryption related settings at the device level */
-	int open_wep; /* Set to 1 to allow unencrypted frames */
+	int open_wep;		/* Set to 1 to allow unencrypted frames */
 
-	int reset_on_keychange; /* Set to 1 if the HW needs to be reset on
+	int reset_on_keychange;	/* Set to 1 if the HW needs to be reset on
 				 * WEP key changes */
 
 	/* If the host performs {en,de}cryption, then set to 1 */
 	int host_encrypt;
 	int host_decrypt;
-	int ieee802_1x; /* is IEEE 802.1X used */
+	int ieee802_1x;		/* is IEEE 802.1X used */
 
 	/* WPA data */
 	int wpa_enabled;
@@ -698,36 +682,36 @@ struct ieee80211_device {
 
 	struct list_head crypt_deinit_list;
 	struct ieee80211_crypt_data *crypt[WEP_KEYS];
-	int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */
+	int tx_keyidx;		/* default TX key index (crypt[tx_keyidx]) */
 	struct timer_list crypt_deinit_timer;
 
-	int bcrx_sta_key; /* use individual keys to override default keys even
-			   * with RX of broad/multicast frames */
+	int bcrx_sta_key;	/* use individual keys to override default keys even
+				 * with RX of broad/multicast frames */
 
 	/* Fragmentation structures */
 	struct ieee80211_frag_entry frag_cache[IEEE80211_FRAG_CACHE_LEN];
 	unsigned int frag_next_idx;
-	u16 fts; /* Fragmentation Threshold */
+	u16 fts;		/* Fragmentation Threshold */
 
 	/* Association info */
 	u8 bssid[ETH_ALEN];
 
 	enum ieee80211_state state;
 
-	int mode;       /* A, B, G */
-	int modulation; /* CCK, OFDM */
-	int freq_band;  /* 2.4Ghz, 5.2Ghz, Mixed */
-	int abg_ture;   /* ABG flag              */
+	int mode;		/* A, B, G */
+	int modulation;		/* CCK, OFDM */
+	int freq_band;		/* 2.4Ghz, 5.2Ghz, Mixed */
+	int abg_ture;		/* ABG flag              */
 
 	int perfect_rssi;
 	int worst_rssi;
 
 	/* Callback functions */
-	void (*set_security)(struct net_device *dev,
-			     struct ieee80211_security *sec);
-	int (*hard_start_xmit)(struct ieee80211_txb *txb,
-			       struct net_device *dev);
-	int (*reset_port)(struct net_device *dev);
+	void (*set_security) (struct net_device * dev,
+			      struct ieee80211_security * sec);
+	int (*hard_start_xmit) (struct ieee80211_txb * txb,
+				struct net_device * dev);
+	int (*reset_port) (struct net_device * dev);
 
 	/* This must be the last item so that it points to the data
 	 * allocated beyond this structure by alloc_ieee80211 */
@@ -760,7 +744,8 @@ extern inline int ieee80211_is_empty_ess
 	return 1;
 }
 
-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,
+					  int mode)
 {
 	/*
 	 * It is possible for both access points and our device to support
@@ -811,8 +796,6 @@ extern inline int ieee80211_get_hdrlen(u
 	return hdrlen;
 }
 
-
-
 /* ieee80211.c */
 extern void free_ieee80211(struct net_device *dev);
 extern struct net_device *alloc_ieee80211(int sizeof_priv);
@@ -820,11 +803,9 @@ extern struct net_device *alloc_ieee8021
 extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
 
 /* ieee80211_tx.c */
-extern int ieee80211_xmit(struct sk_buff *skb,
-			  struct net_device *dev);
+extern int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev);
 extern void ieee80211_txb_free(struct ieee80211_txb *);
 
-
 /* ieee80211_rx.c */
 extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
 			struct ieee80211_rx_stats *rx_stats);
@@ -843,7 +824,6 @@ extern int ieee80211_wx_get_encode(struc
 				   struct iw_request_info *info,
 				   union iwreq_data *wrqu, char *key);
 
-
 extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
 {
 	ieee->scans++;
@@ -854,5 +834,4 @@ extern inline int ieee80211_get_scans(st
 	return ieee->scans;
 }
 
-
-#endif /* IEEE80211_H */
+#endif				/* IEEE80211_H */
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -31,10 +31,10 @@ struct ieee80211_crypto_ops {
 	/* init new crypto context (e.g., allocate private data space,
 	 * select IV, etc.); returns NULL on failure or pointer to allocated
 	 * private data on success */
-	void * (*init)(int keyidx);
+	void *(*init) (int keyidx);
 
 	/* deinitialize crypto context and free allocated private data */
-	void (*deinit)(void *priv);
+	void (*deinit) (void *priv);
 
 	/* encrypt/decrypt return < 0 on error or >= 0 on success. The return
 	 * value from decrypt_mpdu is passed as the keyidx value for
@@ -42,21 +42,21 @@ struct ieee80211_crypto_ops {
 	 * encryption; if not, error will be returned; these functions are
 	 * called for all MPDUs (i.e., fragments).
 	 */
-	int (*encrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv);
-	int (*decrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv);
+	int (*encrypt_mpdu) (struct sk_buff * skb, int hdr_len, void *priv);
+	int (*decrypt_mpdu) (struct sk_buff * skb, int hdr_len, void *priv);
 
 	/* These functions are called for full MSDUs, i.e. full frames.
 	 * These can be NULL if full MSDU operations are not needed. */
-	int (*encrypt_msdu)(struct sk_buff *skb, int hdr_len, void *priv);
-	int (*decrypt_msdu)(struct sk_buff *skb, int keyidx, int hdr_len,
-			    void *priv);
+	int (*encrypt_msdu) (struct sk_buff * skb, int hdr_len, void *priv);
+	int (*decrypt_msdu) (struct sk_buff * skb, int keyidx, int hdr_len,
+			     void *priv);
 
-	int (*set_key)(void *key, int len, u8 *seq, void *priv);
-	int (*get_key)(void *key, int len, u8 *seq, void *priv);
+	int (*set_key) (void *key, int len, u8 * seq, void *priv);
+	int (*get_key) (void *key, int len, u8 * seq, void *priv);
 
 	/* procfs handler for printing out key information and possible
 	 * statistics */
-	char * (*print_stats)(char *p, void *priv);
+	char *(*print_stats) (char *p, void *priv);
 
 	/* maximum number of bytes added by encryption; encrypt buf is
 	 * allocated with extra_prefix_len bytes, copy of in_buf, and
@@ -69,7 +69,7 @@ struct ieee80211_crypto_ops {
 };
 
 struct ieee80211_crypt_data {
-	struct list_head list; /* delayed deletion list */
+	struct list_head list;	/* delayed deletion list */
 	struct ieee80211_crypto_ops *ops;
 	void *priv;
 	atomic_t refcnt;
@@ -77,7 +77,7 @@ struct ieee80211_crypt_data {
 
 int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
 int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name);
+struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name);
 void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
 void ieee80211_crypt_deinit_handler(unsigned long);
 void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -191,18 +191,18 @@ static void ieee80211_crypt_null_deinit(
 }
 
 static struct ieee80211_crypto_ops ieee80211_crypt_null = {
-	.name			= "NULL",
-	.init			= ieee80211_crypt_null_init,
-	.deinit			= ieee80211_crypt_null_deinit,
-	.encrypt_mpdu		= NULL,
-	.decrypt_mpdu		= NULL,
-	.encrypt_msdu		= NULL,
-	.decrypt_msdu		= NULL,
-	.set_key		= NULL,
-	.get_key		= NULL,
-	.extra_prefix_len	= 0,
-	.extra_postfix_len	= 0,
-	.owner			= THIS_MODULE,
+	.name = "NULL",
+	.init = ieee80211_crypt_null_init,
+	.deinit = ieee80211_crypt_null_deinit,
+	.encrypt_mpdu = NULL,
+	.decrypt_mpdu = NULL,
+	.encrypt_msdu = NULL,
+	.decrypt_msdu = NULL,
+	.set_key = NULL,
+	.get_key = NULL,
+	.extra_prefix_len = 0,
+	.extra_postfix_len = 0,
+	.owner = THIS_MODULE,
 };
 
 static int __init ieee80211_crypto_init(void)
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -426,19 +426,19 @@ static char *ieee80211_ccmp_print_stats(
 }
 
 static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
-	.name			= "CCMP",
-	.init			= ieee80211_ccmp_init,
-	.deinit			= ieee80211_ccmp_deinit,
-	.encrypt_mpdu		= ieee80211_ccmp_encrypt,
-	.decrypt_mpdu		= ieee80211_ccmp_decrypt,
-	.encrypt_msdu		= NULL,
-	.decrypt_msdu		= NULL,
-	.set_key		= ieee80211_ccmp_set_key,
-	.get_key		= ieee80211_ccmp_get_key,
-	.print_stats		= ieee80211_ccmp_print_stats,
-	.extra_prefix_len	= CCMP_HDR_LEN,
-	.extra_postfix_len	= CCMP_MIC_LEN,
-	.owner			= THIS_MODULE,
+	.name = "CCMP",
+	.init = ieee80211_ccmp_init,
+	.deinit = ieee80211_ccmp_deinit,
+	.encrypt_mpdu = ieee80211_ccmp_encrypt,
+	.decrypt_mpdu = ieee80211_ccmp_decrypt,
+	.encrypt_msdu = NULL,
+	.decrypt_msdu = NULL,
+	.set_key = ieee80211_ccmp_set_key,
+	.get_key = ieee80211_ccmp_get_key,
+	.print_stats = ieee80211_ccmp_print_stats,
+	.extra_prefix_len = CCMP_HDR_LEN,
+	.extra_postfix_len = CCMP_MIC_LEN,
+	.owner = THIS_MODULE,
 };
 
 static int __init ieee80211_crypto_ccmp_init(void)
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -654,19 +654,19 @@ static char *ieee80211_tkip_print_stats(
 }
 
 static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
-	.name			= "TKIP",
-	.init			= ieee80211_tkip_init,
-	.deinit			= ieee80211_tkip_deinit,
-	.encrypt_mpdu		= ieee80211_tkip_encrypt,
-	.decrypt_mpdu		= ieee80211_tkip_decrypt,
-	.encrypt_msdu		= ieee80211_michael_mic_add,
-	.decrypt_msdu		= ieee80211_michael_mic_verify,
-	.set_key		= ieee80211_tkip_set_key,
-	.get_key		= ieee80211_tkip_get_key,
-	.print_stats		= ieee80211_tkip_print_stats,
-	.extra_prefix_len	= 4 + 4,	/* IV + ExtIV */
-	.extra_postfix_len	= 8 + 4,	/* MIC + ICV */
-	.owner			= THIS_MODULE,
+	.name = "TKIP",
+	.init = ieee80211_tkip_init,
+	.deinit = ieee80211_tkip_deinit,
+	.encrypt_mpdu = ieee80211_tkip_encrypt,
+	.decrypt_mpdu = ieee80211_tkip_decrypt,
+	.encrypt_msdu = ieee80211_michael_mic_add,
+	.decrypt_msdu = ieee80211_michael_mic_verify,
+	.set_key = ieee80211_tkip_set_key,
+	.get_key = ieee80211_tkip_get_key,
+	.print_stats = ieee80211_tkip_print_stats,
+	.extra_prefix_len = 4 + 4,	/* IV + ExtIV */
+	.extra_postfix_len = 8 + 4,	/* MIC + ICV */
+	.owner = THIS_MODULE,
 };
 
 static int __init ieee80211_crypto_tkip_init(void)
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -229,19 +229,19 @@ static char *prism2_wep_print_stats(char
 }
 
 static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
-	.name			= "WEP",
-	.init			= prism2_wep_init,
-	.deinit			= prism2_wep_deinit,
-	.encrypt_mpdu		= prism2_wep_encrypt,
-	.decrypt_mpdu		= prism2_wep_decrypt,
-	.encrypt_msdu		= NULL,
-	.decrypt_msdu		= NULL,
-	.set_key		= prism2_wep_set_key,
-	.get_key		= prism2_wep_get_key,
-	.print_stats		= prism2_wep_print_stats,
-	.extra_prefix_len	= 4,	/* IV */
-	.extra_postfix_len	= 4,	/* ICV */
-	.owner			= THIS_MODULE,
+	.name = "WEP",
+	.init = prism2_wep_init,
+	.deinit = prism2_wep_deinit,
+	.encrypt_mpdu = prism2_wep_encrypt,
+	.decrypt_mpdu = prism2_wep_decrypt,
+	.encrypt_msdu = NULL,
+	.decrypt_msdu = NULL,
+	.set_key = prism2_wep_set_key,
+	.get_key = prism2_wep_get_key,
+	.print_stats = prism2_wep_print_stats,
+	.extra_prefix_len = 4,	/* IV */
+	.extra_postfix_len = 4,	/* ICV */
+	.owner = THIS_MODULE,
 };
 
 static int __init ieee80211_crypto_wep_init(void)
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -378,33 +378,47 @@ int ieee80211_rx(struct ieee80211_device
 	frag = WLAN_GET_SEQ_FRAG(sc);
 	hdrlen = ieee80211_get_hdrlen(fc);
 
-#ifdef NOT_YET
-#if WIRELESS_EXT > 15
 	/* Put this code here so that we avoid duplicating it in all
 	 * Rx paths. - Jean II */
 #ifdef IW_WIRELESS_SPY		/* defined in iw_handler.h */
 	/* If spy monitoring on */
-	if (iface->spy_data.spy_number > 0) {
+	if (ieee->spy_data.spy_number > 0) {
 		struct iw_quality wstats;
-		wstats.level = rx_stats->signal;
-		wstats.noise = rx_stats->noise;
-		wstats.updated = 6;	/* No qual value */
+
+		wstats.updated = 0;
+		if (rx_stats->mask & IEEE80211_STATMASK_RSSI) {
+			wstats.level = rx_stats->rssi;
+			wstats.updated |= IW_QUAL_LEVEL_UPDATED;
+		} else
+			wstats.updated |= IW_QUAL_LEVEL_INVALID;
+
+		if (rx_stats->mask & IEEE80211_STATMASK_NOISE) {
+			wstats.noise = rx_stats->noise;
+			wstats.updated |= IW_QUAL_NOISE_UPDATED;
+		} else
+			wstats.updated |= IW_QUAL_NOISE_INVALID;
+
+		if (rx_stats->mask & IEEE80211_STATMASK_SIGNAL) {
+			wstats.qual = rx_stats->signal;
+			wstats.updated |= IW_QUAL_QUAL_UPDATED;
+		} else
+			wstats.updated |= IW_QUAL_QUAL_INVALID;
+
 		/* Update spy records */
-		wireless_spy_update(dev, hdr->addr2, &wstats);
+		wireless_spy_update(ieee->dev, hdr->addr2, &wstats);
 	}
 #endif				/* IW_WIRELESS_SPY */
-#endif				/* WIRELESS_EXT > 15 */
+
+#ifdef NOT_YET
 	hostap_update_rx_stats(local->ap, hdr, rx_stats);
 #endif
 
-#if WIRELESS_EXT > 15
 	if (ieee->iw_mode == IW_MODE_MONITOR) {
 		ieee80211_monitor_rx(ieee, skb, rx_stats);
 		stats->rx_packets++;
 		stats->rx_bytes += skb->len;
 		return 1;
 	}
-#endif
 
 	if (ieee->host_decrypt) {
 		int idx = 0;
@@ -771,8 +785,7 @@ static inline int ieee80211_is_ofdm_rate
 	return 0;
 }
 
-static inline int ieee80211_network_init(struct ieee80211_device *ieee,
-					 struct ieee80211_probe_response
+static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct ieee80211_probe_response
 					 *beacon,
 					 struct ieee80211_network *network,
 					 struct ieee80211_rx_stats *stats)
@@ -1028,11 +1041,9 @@ static inline void update_network(struct
 }
 
 static inline void ieee80211_process_probe_response(struct ieee80211_device
-						    *ieee,
-						    struct
+						    *ieee, struct
 						    ieee80211_probe_response
-						    *beacon,
-						    struct ieee80211_rx_stats
+						    *beacon, struct ieee80211_rx_stats
 						    *stats)
 {
 	struct ieee80211_network network;

[Ieee80211-devel] [PATCH 2/29] ieee80211 quality scaling algorithm extension handler

[James K. <jke...@li...>]

Incorporated Bill Moss' quality scaling algorithm into default wireless
extension handler.

Signed-off-by: James Ketrenos <jke...@li...>

---

 include/net/ieee80211.h      |    3 +++
 net/ieee80211/ieee80211_wx.c |   40 ++++++++++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 10 deletions(-)

b206938b1c1dfb9fbacf42308a0e2066ef677092
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -719,6 +719,9 @@ struct ieee80211_device {
 	int freq_band;  /* 2.4Ghz, 5.2Ghz, Mixed */
 	int abg_ture;   /* ABG flag              */
 
+	int perfect_rssi;
+	int worst_rssi;
+
 	/* Callback functions */
 	void (*set_security)(struct net_device *dev,
 			     struct ieee80211_security *sec);
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -140,18 +140,38 @@ static inline char *ipw2100_translate_sc
 		start = iwe_stream_add_point(start, stop, &iwe, custom);
 
 	/* Add quality statistics */
-	/* TODO: Fix these values... */
 	iwe.cmd = IWEVQUAL;
-	iwe.u.qual.qual = network->stats.signal;
-	iwe.u.qual.level = network->stats.rssi;
-	iwe.u.qual.noise = network->stats.noise;
-	iwe.u.qual.updated = network->stats.mask & IEEE80211_STATMASK_WEMASK;
-	if (!(network->stats.mask & IEEE80211_STATMASK_RSSI))
-		iwe.u.qual.updated |= IW_QUAL_LEVEL_INVALID;
-	if (!(network->stats.mask & IEEE80211_STATMASK_NOISE))
+	iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
+	    IW_QUAL_NOISE_UPDATED;
+
+	if (!(network->stats.mask & IEEE80211_STATMASK_RSSI)) {
+		iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID |
+		    IW_QUAL_LEVEL_INVALID;
+		iwe.u.qual.qual = 0;
+		iwe.u.qual.level = 0;
+	} else {
+		iwe.u.qual.level = network->stats.rssi;
+		iwe.u.qual.qual =
+		    (100 *
+		     (ieee->perfect_rssi - ieee->worst_rssi) *
+		     (ieee->perfect_rssi - ieee->worst_rssi) -
+		     (ieee->perfect_rssi - network->stats.rssi) *
+		     (15 * (ieee->perfect_rssi - ieee->worst_rssi) +
+		      62 * (ieee->perfect_rssi - network->stats.rssi))) /
+		    ((ieee->perfect_rssi - ieee->worst_rssi) *
+		     (ieee->perfect_rssi - ieee->worst_rssi));
+		if (iwe.u.qual.qual > 100)
+			iwe.u.qual.qual = 100;
+		else if (iwe.u.qual.qual < 1)
+			iwe.u.qual.qual = 0;
+	}
+
+	if (!(network->stats.mask & IEEE80211_STATMASK_NOISE)) {
 		iwe.u.qual.updated |= IW_QUAL_NOISE_INVALID;
-	if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL))
-		iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID;
+		iwe.u.qual.noise = 0;
+	} else {
+		iwe.u.qual.noise = network->stats.noise;
+	}
 
 	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
 

[Ieee80211-devel] [PATCH 1/29] Fixed some endian issues with 802.11 header usage in ieee80211_rx.c

[James K. <jke...@li...>]

Fixed some endian issues with 802.11 header usage in ieee80211_rx.c

Signed-off-by: James Ketrenos <jke...@li...>

---

 net/ieee80211/ieee80211_rx.c |   43 +++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

ec5b9e11d9989be050fbe463fa9bff4201fe3da7
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -787,11 +787,11 @@ static inline int ieee80211_network_init
 
 	/* Pull out fixed field data */
 	memcpy(network->bssid, beacon->header.addr3, ETH_ALEN);
-	network->capability = beacon->capability;
+	network->capability = le16_to_cpu(beacon->capability);
 	network->last_scanned = jiffies;
-	network->time_stamp[0] = beacon->time_stamp[0];
-	network->time_stamp[1] = beacon->time_stamp[1];
-	network->beacon_interval = beacon->beacon_interval;
+	network->time_stamp[0] = le32_to_cpu(beacon->time_stamp[0]);
+	network->time_stamp[1] = le32_to_cpu(beacon->time_stamp[1]);
+	network->beacon_interval = le16_to_cpu(beacon->beacon_interval);
 	/* Where to pull this? beacon->listen_interval; */
 	network->listen_interval = 0x0A;
 	network->rates_len = network->rates_ex_len = 0;
@@ -1070,8 +1070,9 @@ static inline void ieee80211_process_pro
 				     escape_essid(info_element->data,
 						  info_element->len),
 				     MAC_ARG(beacon->header.addr3),
-				     WLAN_FC_GET_STYPE(beacon->header.
-						       frame_ctl) ==
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (beacon->header.
+							frame_ctl)) ==
 				     IEEE80211_STYPE_PROBE_RESP ?
 				     "PROBE RESPONSE" : "BEACON");
 		return;
@@ -1122,8 +1123,9 @@ static inline void ieee80211_process_pro
 				     escape_essid(network.ssid,
 						  network.ssid_len),
 				     MAC_ARG(network.bssid),
-				     WLAN_FC_GET_STYPE(beacon->header.
-						       frame_ctl) ==
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (beacon->header.
+							frame_ctl)) ==
 				     IEEE80211_STYPE_PROBE_RESP ?
 				     "PROBE RESPONSE" : "BEACON");
 #endif
@@ -1134,8 +1136,9 @@ static inline void ieee80211_process_pro
 				     escape_essid(target->ssid,
 						  target->ssid_len),
 				     MAC_ARG(target->bssid),
-				     WLAN_FC_GET_STYPE(beacon->header.
-						       frame_ctl) ==
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (beacon->header.
+							frame_ctl)) ==
 				     IEEE80211_STYPE_PROBE_RESP ?
 				     "PROBE RESPONSE" : "BEACON");
 		update_network(target, &network);
@@ -1148,20 +1151,23 @@ void ieee80211_rx_mgt(struct ieee80211_d
 		      struct ieee80211_hdr *header,
 		      struct ieee80211_rx_stats *stats)
 {
-	switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {
+	switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) {
 	case IEEE80211_STYPE_ASSOC_RESP:
 		IEEE80211_DEBUG_MGMT("received ASSOCIATION RESPONSE (%d)\n",
-				     WLAN_FC_GET_STYPE(header->frame_ctl));
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
 		break;
 
 	case IEEE80211_STYPE_REASSOC_RESP:
 		IEEE80211_DEBUG_MGMT("received REASSOCIATION RESPONSE (%d)\n",
-				     WLAN_FC_GET_STYPE(header->frame_ctl));
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
 		break;
 
 	case IEEE80211_STYPE_PROBE_RESP:
 		IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
-				     WLAN_FC_GET_STYPE(header->frame_ctl));
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
 		IEEE80211_DEBUG_SCAN("Probe response\n");
 		ieee80211_process_probe_response(ieee,
 						 (struct
@@ -1171,7 +1177,8 @@ void ieee80211_rx_mgt(struct ieee80211_d
 
 	case IEEE80211_STYPE_BEACON:
 		IEEE80211_DEBUG_MGMT("received BEACON (%d)\n",
-				     WLAN_FC_GET_STYPE(header->frame_ctl));
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
 		IEEE80211_DEBUG_SCAN("Beacon\n");
 		ieee80211_process_probe_response(ieee,
 						 (struct
@@ -1181,10 +1188,12 @@ void ieee80211_rx_mgt(struct ieee80211_d
 
 	default:
 		IEEE80211_DEBUG_MGMT("received UNKNOWN (%d)\n",
-				     WLAN_FC_GET_STYPE(header->frame_ctl));
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
 		IEEE80211_WARNING("%s: Unknown management packet: %d\n",
 				  ieee->dev->name,
-				  WLAN_FC_GET_STYPE(header->frame_ctl));
+				  WLAN_FC_GET_STYPE(le16_to_cpu
+						    (header->frame_ctl)));
 		break;
 	}
 }

[Ieee80211-devel] [PATCH 0/29] ieee80211 updates

[James K. <jke...@li...>]

This patch series brings the kernel version of ieee80211 to be in sync with the latest version being used in conjunction with the ipw2100 and ipw2200 projects.  This series is against netdev-2.6 commit-id caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (master as of Sept. 07)

The entire series can be obtained from the GIT overlay available at rsync://bughost.org/repos/ieee80211-delta/.git/  For those interested in pulling the GIT version, the following will help automate this:

	% rsync rsync://bughost.org/repos/scripts/git-grab-overlay \
		git-grab-overlay
	% ./git-grab-overlay rsync://bughost.org/repos/ieee80211-delta \
		ieee80211-delta

If you want to import the overlay into an existing up-to-date kernel repository tha has commit-id caf39e87cc1182f7dae84eefc43ca14d54c78ef9, then you can simply:

	% cd $REPO
	% rsync -avpr rsync://bughost.org/repos/ieee80211-delta/.git/objects/ \
		.git/objects/
	% rsync rsync://bughost.org/repos/ieee80211-delta/.git/refs/heads/master \
		.git/refs/heads/ieee80211-tip

You can then view the GIT history for this series via (assuming you have cogito):

	% cg-log -r caf39e87cc1182f7dae84eefc43ca14d54c78ef9:ieee80211-tip

diffstat information for this series follows:

 include/net/ieee80211.h              |  487 +++++++++++++++++++++++++--------
 include/net/ieee80211_crypt.h        |   46 ++-
 include/net/ieee80211_radiotap.h     |  237 ++++++++++++++++
 net/ieee80211/Makefile               |    3
 net/ieee80211/ieee80211_crypt.c      |   59 ++--
 net/ieee80211/ieee80211_crypt_ccmp.c |   36 +-
 net/ieee80211/ieee80211_crypt_tkip.c |   54 +--
 net/ieee80211/ieee80211_crypt_wep.c  |   26 -
 net/ieee80211/ieee80211_geo.c        |  141 +++++++++
 net/ieee80211/ieee80211_module.c     |   64 ++--
 net/ieee80211/ieee80211_rx.c         |  503 +++++++++++++++++++++++++++++------
 net/ieee80211/ieee80211_tx.c         |  286 +++++++++++++++----
 net/ieee80211/ieee80211_wx.c         |  366 +++++++++++++++++++++----
 13 files changed, 1867 insertions(+), 441 deletions(-)

James

[Ieee80211-devel] RE: Git broken for IPW2200

[Alejandro B. <abo...@li...>]

> Alejandro Bonilla Beeche wrote:
> > Hi,
> > 
> > 	Where does one report this? I was building Linus Git 
> tree as per I
> > updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> > 
> > Where do I report this?
> > 
> > Debian unstable updated at same time.
> > 
> > it looks like ipw2200 is thinking that ieee80211 is not 
> compiled in, but
> > I did select it as a module?
> 
> Care to send your .config?
> 
> 	Jeff

Jeff,

	http://lkml.org/lkml/2005/9/8/5

It was already fixed anyway, the thread is about 7 days old.

My config is at that URL.

.Alejandro

[Ieee80211-devel] RE: Git broken for IPW2200

[Alejandro B. <abo...@li...>]

> Alejandro Bonilla Beeche wrote:
> > Hi,
> >
> > 	Where does one report this? I was building Linus Git
> tree as per I
> > updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> >
> > Where do I report this?
> >
> > Debian unstable updated at same time.
> >
> > it looks like ipw2200 is thinking that ieee80211 is not
> compiled in, but
> > I did select it as a module?
>
> Care to send your .config?
>
> 	Jeff

Hi Jeff,

	I already did. Let me see if I can look for the it in some archive, unless
you know how to do this faster. (PC not here ATM)

.Alejandro

[Ieee80211-devel] Re: Git broken for IPW2200

[Jeff G. <jg...@po...>]

Alejandro Bonilla Beeche wrote:
> Hi,
> 
> 	Where does one report this? I was building Linus Git tree as per I
> updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> 
> Where do I report this?
> 
> Debian unstable updated at same time.
> 
> it looks like ipw2200 is thinking that ieee80211 is not compiled in, but
> I did select it as a module?

Care to send your .config?

	Jeff

[Ieee80211-devel] Re: Git broken for IPW2200

[Bill D. <dav...@tm...>]

Alejandro Bonilla Beeche wrote:
> Hi,
> 
> 	Where does one report this? I was building Linus Git tree as per I
> updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> 
> Where do I report this?
> 
> Debian unstable updated at same time.
> 
> it looks like ipw2200 is thinking that ieee80211 is not compiled in, but
> I did select it as a module?
> 
I got the same error, and git11 did build, although it works exactly as 
well as ever, which is to say not at all.

-- 
    -bill davidsen (dav...@tm...)
"The secret to procrastination is to put things off until the
  last possible moment - but no longer"  -me

Re: [Ieee80211-devel] Re: ieee80211 patches

[Pedro R. <ram...@se...>]

Jiri Benc wrote:
> On Thu, 01 Sep 2005 19:16:05 +0100, Pedro Ramalhais wrote:
> 
>>> Of
>>>course you may sometimes want to force reassociation manually - and
>>>there should be some call available for this. (Maybe setting BSSID while
>>>the card is running should force reassociation?)
>>
>>That's the kind of hackish solution that brings confusion. We should
>>separate things: wireless configuration and wireless association. This
>>way you won't have to do those hackish approaches and special cases.
>>What i mean is that if you want to associate, tell the card to do so,
>>don't send -1 as the channel or send 0 as the essid_len, or resend the
>>previously configured essid.
> 
> 
> I probably didn't explain well what I thought, sorry. Imagine following
> situation: we have an AP with BSSID1 and another one with BSSID2, both
> in the same ESS. When you set just the ESSID, somebody (kernel or
> daemon, I'm still not decided on this) tell the driver to associate to
> one of the APs - e.g. to BSSID1. When conditions change, the driver is
> told to reassociate (to BSSID2). And so on. When you manually set BSSID2
> (while we are associated to BSSID1), it surely means that the user wants
> to reassociate to BSSID2 - there is nothing hackish in that.
> 
> But you're right anyway.
> 
> 

Hi!

You did explain it well, however i'm not convinced that association
should be automatically tried after you change configuration. I still
think configuration should be independent of association, or at least be
optional (ex: iwconfig iface0 essid NEWESSID associate manual VS
iwconfig iface0 essid NEWESSID auto). If you make association automatic
upon configuration, it will bypass userspace daemons that might be
controling wireless profiles/association.

I missed the case where one needs to revert some of the settings to the
default, which makes my point about the -1,0 values being default
settings a bit useless. However i still think it's a good idea to make
the configuration/association work like the commit command in wireless
extensions/tools, and enforce it in the kernel interface.

I also just remembered one case where you might not want to associate
immediately after configuration, but apply the configuration in the
card: setting the essid so that you can scan,receive and detect the
beacons from an AP with hidden SSID.

To summarize it all, it looks to me that the steps for wireless
configuration should be something like:

1 - Load the driver.
2 - Load the firmware when we are sure that hotplug is running and can
read the firmware from the filesystem (not sure if this is doable, maybe
make the driver retry from time to time, ocasionally output a warning
message saying it couldn't load the firmware, and only create the
network interface after the firmware is loaded successfuly).
3 - Bring the interface UP (IFF_UP).
4 - Configure it (ESSID, Channel, etc...).
5 - Commit the configuration to the driver/card (don't make it associate).
6 - Tell the card to associate, selecting manual or automatic (similar
to roaming?).
7 - At this step, if association is successful the interface would be
IFF_RUNNING, so, link would be detected by userspace apps.
8 - Start DHCP (and possibly wpa_supplicant).

Steps 4, 5 and 6 could probably be optionally issued at the same time in
one command to prevent users from having to type multiple commands.

Step 8 still has the problem of DHCP being started at the same time as
wpa_supplicant. DHCP has no way of knowing that wpa_supplicant has
established authentication. This problem probably already exists with
wired 802.1X authentication. Maybe there should be some interaction
beteween userspace daemons that handle authentication (802.1X, WPA,
etc...) and the kernel, so that they instruct the kernel that
authentication was successful and some flag could be set on the
interface that the interface is ready for communication, OR make the
daemons that need to know if the interface is ready for communication
get that information from the auth daemons.

I hope this makes sense, it's just the way i see it. I'd like to know
about other opinions.

Thanks!
-- 
Pedro Ramalhais

Re: [Ieee80211-devel] eth0 vs. wlan0 [was Re: ieee80211 patches]

[Pedro R. <ram...@se...>]

Pavel Machek wrote:
> Hi!
> 
> I noticed that wireless patches are now in the mainline. That is good,
> patches are getting smaller, but it is going to make future user
> interface changes harder; and thats very bad.
> 
> There are good reasons to have wireless interfaces as wlanX, with
> tcpdump showing wireless packetes, etc; but current patches name it
> ethX, and you get plain ethernet packets on tcpdump. Are we going to
> keep showing wireless interfaces as ethernet ones forever, or do we
> plan to switch to wlanX? If we decide to switch, we should either
> switch before 2.6.14, or disable wireless before 2.6.14 so that we do
> not confuse users too badly...
> 								Pavel

Hi!

I don't think the interface name matters, it can also be changed at
runtime from userspace. Software shouldn't rely on the name to switch
it's behaviour. In your example tcpdump should not look for the name. It
should instead look at the link encapsulation or wireless extensions
capabilities. However i agree that there must be a consistent default in
the kernel and even in the out-of-tree drivers (although in this case
this is currently not enforceable).
If we expect the ieee80211 stuff to evolve into it's own stack, i think
it could be wise to make the default wireless interfaces name default to
something else other than eth%d.

On the subject of the inclusion of ieee80211, ipw2x00 drivers and other
netdev tree's changes into mainline, it's hard for me to understand why
the "versions" of these components are so old compared to the versions
currently being released by the ieee80211, ipw2100, ipw2200 projects.
If someone could enlighten me on this subject it would be appreciated.

Thanks!
-- 
Pedro Ramalhais

[Ieee80211-devel] RE: Git broken for IPW2200

[Alejandro B. <abo...@li...>]

> IPW2200 requires a different ieee80211 stack, this can be had at
> ieee80211.sourceforge.net

Joe,

	The stack is already in mainline in Linus Git. I should not need to
download the ieee80211 from any place but compile with the one in the
kernel.

.Alejandro

>
>
> Alejandro Bonilla Beeche wrote:
> > Hi,
> >
> > 	Where does one report this? I was building Linus Git
> tree as per I
> > updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> >
> > Where do I report this?
> >
> > Debian unstable updated at same time.
> >
> > it looks like ipw2200 is thinking that ieee80211 is not
> compiled in, but
> > I did select it as a module?
> >
> > drivers/net/wireless/ipw2200.c:6676: error: dereferencing pointer to

[Ieee80211-devel] Re: Git broken for IPW2200

[Joe B. S. <jo...@sp...>]

IPW2200 requires a different ieee80211 stack, this can be had at 
ieee80211.sourceforge.net



Alejandro Bonilla Beeche wrote:
> Hi,
> 
> 	Where does one report this? I was building Linus Git tree as per I
> updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> 
> Where do I report this?
> 
> Debian unstable updated at same time.
> 
> it looks like ipw2200 is thinking that ieee80211 is not compiled in, but
> I did select it as a module?
> 
> drivers/net/wireless/ipw2200.c:6676: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6677: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6679: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6679: error: 'WLAN_AUTH_SHARED_KEY'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:6686: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6686: error: 'SEC_ENABLED' undeclared
> (first use in this function)
> drivers/net/wireless/ipw2200.c:6687: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6689: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6691: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6697: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6697: error: 'SEC_LEVEL' undeclared
> (first use in this function)
> drivers/net/wireless/ipw2200.c:6698: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6699: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c: In function 'init_supported_rates':
> drivers/net/wireless/ipw2200.c:6727: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6728: error: 'IEEE80211_52GHZ_BAND'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:6731: error: 'IEEE80211_CCK_MODULATION'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:6732: error:
> 'IEEE80211_OFDM_DEFAULT_RATES_MASK' undeclared (first use in this
> function)
> drivers/net/wireless/ipw2200.c:6739: error:
> 'IEEE80211_CCK_DEFAULT_RATES_MASK' undeclared (first use in this
> function)
> drivers/net/wireless/ipw2200.c:6740: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:6740: error: 'IEEE80211_OFDM_MODULATION'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c: In function 'ipw_net_init':
> drivers/net/wireless/ipw2200.c:6887: warning: initialization makes
> pointer from integer without a cast
> drivers/net/wireless/ipw2200.c: In function 'ipw_pci_probe':
> drivers/net/wireless/ipw2200.c:6970: warning: implicit declaration of
> function 'alloc_ieee80211'
> drivers/net/wireless/ipw2200.c:6970: warning: assignment makes pointer
> from integer without a cast
> drivers/net/wireless/ipw2200.c:6976: warning: assignment makes pointer
> from integer without a cast
> drivers/net/wireless/ipw2200.c:7060: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7069: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7078: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7079: error: 'IEEE80211_52GHZ_BAND'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:7079: error: 'IEEE80211_24GHZ_BAND'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:7080: error: 'IEEE80211_OFDM_MODULATION'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:7081: error: 'IEEE80211_CCK_MODULATION'
> undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:7083: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7083: error: 'IEEE_A' undeclared (first
> use in this function)
> drivers/net/wireless/ipw2200.c:7083: error: 'IEEE_G' undeclared (first
> use in this function)
> drivers/net/wireless/ipw2200.c:7083: error: 'IEEE_B' undeclared (first
> use in this function)
> drivers/net/wireless/ipw2200.c:7094: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7099: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7102: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7103: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7105: error:
> 'IEEE80211_DEFAULT_RATES_MASK' undeclared (first use in this function)
> drivers/net/wireless/ipw2200.c:7126: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7127: error: dereferencing pointer to
> incomplete type
> drivers/net/wireless/ipw2200.c:7172: warning: implicit declaration of
> function 'free_ieee80211'
> make[4]: *** [drivers/net/wireless/ipw2200.o] Error 1
> make[3]: *** [drivers/net/wireless] Error 2
> make[2]: *** [drivers/net] Error 2
> make[1]: *** [drivers] Error 2
> make[1]: Leaving directory `/root/linux-2.6'
> make: *** [stamp-build] Error 2
> debian:~/linux-2.6#
> 
> .Alejandro
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to maj...@vg...
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 
> 
> ------------------------------------------------------------------------
> 
> -- 
> / This message has been classified as *non-spam*.
> Mark this message as spam. 
> <mailto:sp...@sp...?Subject=09072005183846-20792&body=Click 
> the send button to mark this message as spam.>
> 
> Thank you for using the crm114 Spam Control System. /

[Ieee80211-devel] Re: ieee80211 patches

[Jeff G. <jg...@po...>]

James Ketrenos wrote:
> Jeff Garzik wrote:
> 
> 
>>It seems like some of this overlaps changes already in upstream. 
>>What's the best way to start this process?  I would prefer to receive
>>patches rather than 'git pull' at the present time.
> 
> 
> Understood.
> 
> 
>>Should I Lindent the files first?
> 
> 
> Probably cleanest that way.  I've been passing the net/ieee80211/*.c and
> include/net/ieee80211*.h files through the following script:
> 
> #!/usr/bin/env bash
> scripts/Lindent $@
> for file in $@; do
>         sed -i -e "s:\ *\$::g" -e "s:\t*\$::g" $file;
> done
> 
> I don't know if Lindent strips trailing whitespace, so I stuck the sed
> in there for good measure.
> 
> 
>>Would you rather just start sending those 50+ patches?
> 
> 
> I can pull netdev-2.6#ieee80211 once you have a Lindent'd version and I
> can then (hopefully) run my rebase scripts, weeding out dups, and can
> then send the patches out.

FWIW now that upstream has ieee80211, the branch is gone from 
netdev-2.6.  ieee80211/ipw changes will usually go straight into the 
'upstream' branch that I send to Andrew/Linus on a regular basis.

As of this writing, -all- ieee80211 patches have been committed 
upstream, and appear in Linus's linux-2.6.git tree.  Including the 
Lindent change.

Feel free to start submitting patches, diff'd against the latest upstream.

	Jeff

[Ieee80211-devel] Re: Git broken for IPW2200

[Jeff G. <jg...@po...>]

Alejandro Bonilla Beeche wrote:
> Hi,
> 
> 	Where does one report this? I was building Linus Git tree as per I
> updated it at 09/07/2005 7:00PM PDT and got this while compiling.
> 
> Where do I report this?
> 
> Debian unstable updated at same time.
> 
> it looks like ipw2200 is thinking that ieee80211 is not compiled in, but
> I did select it as a module?

Wanna post a URL to your .config?

	Jeff