Attachment 203631 Details for Bug 250913 – J. Linville's patch updated to apply against 2.6.22.5

[patch] J. Linville's patch updated to apply against 2.6.22.5

linux-2.6-mac80211-store-channel-info-in-sta_bss_list.patch (text/plain), 5.09 KB, created by Christopher Brown on 2007-09-24 00:08:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Brown

Created: 2007-09-24 00:08:01 UTC

Size: 5.09 KB

patch

obsolete

>--- a/net/mac80211/ieee80211_sta.c	2007-09-23 23:45:52.000000000 +0100
>+++ b/net/mac80211/ieee80211_sta.c	2007-09-23 23:57:12.000000000 +0100
>@@ -64,7 +64,7 @@
> static void ieee80211_send_probe_req(struct net_device *dev, u8 *dst,
> 				     u8 *ssid, size_t ssid_len);
> static struct ieee80211_sta_bss *
>-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid);
>+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel);
> static void ieee80211_rx_bss_put(struct net_device *dev,
> 				 struct ieee80211_sta_bss *bss);
> static int ieee80211_sta_find_ibss(struct net_device *dev,
>@@ -453,6 +453,7 @@
> 				     struct ieee80211_if_sta *ifsta,
> 				     unsigned int assoc)
> {
>+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> 	union iwreq_data wrqu;
> 
> 	if (!!(ifsta->flags & IEEE80211_STA_ASSOCIATED) == assoc)
>@@ -468,7 +469,8 @@
> 		if (sdata->type != IEEE80211_IF_TYPE_STA)
> 			return;
> 
>-		bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
>+		bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
>+					   local->hw.conf.channel);
> 		if (bss) {
> 			if (bss->has_erp_value)
> 				ieee80211_handle_erp_ie(dev, bss->erp_value);
>@@ -615,7 +617,7 @@
> 		capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME |
> 			WLAN_CAPABILITY_SHORT_PREAMBLE;
> 	}
>-	bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
>+	bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel);
> 	if (bss) {
> 		if (bss->capability & WLAN_CAPABILITY_PRIVACY)
> 			capab |= WLAN_CAPABILITY_PRIVACY;
>@@ -1178,6 +1180,7 @@
> static int ieee80211_privacy_mismatch(struct net_device *dev,
> 				      struct ieee80211_if_sta *ifsta)
> {
>+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> 	struct ieee80211_sta_bss *bss;
> 	int res = 0;
> 
>@@ -1185,7 +1188,7 @@
> 	    ifsta->key_management_enabled)
> 		return 0;
> 
>-	bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
>+	bss = ieee80211_rx_bss_get(dev, ifsta->bssid, local->hw.conf.channel);
> 	if (!bss)
> 		return 0;
> 
>@@ -1693,7 +1696,8 @@
> 	 * update our stored copy */
> 	if (elems.erp_info && elems.erp_info_len >= 1) {
> 		struct ieee80211_sta_bss *bss
>-			= ieee80211_rx_bss_get(dev, ifsta->bssid);
>+			= ieee80211_rx_bss_get(dev, ifsta->bssid,
>+					       local->hw.conf.channel);
> 		if (bss) {
> 			bss->erp_value = elems.erp_info[0];
> 			bss->has_erp_value = 1;
>@@ -1723,7 +1727,8 @@
> 			       " AP\n", dev->name);
> 			return;
> 		}
>-		bss = ieee80211_rx_bss_get(dev, ifsta->bssid);
>+		bss = ieee80211_rx_bss_get(dev, ifsta->bssid,
>+					   local->hw.conf.channel);
> 		if (bss) {
> 			sta->last_rssi = bss->rssi;
> 			sta->last_signal = bss->signal;
>@@ -2071,7 +2076,7 @@
> 
> 
> static struct ieee80211_sta_bss *
>-ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid)
>+ieee80211_rx_bss_add(struct net_device *dev, u8 *bssid, int channel)
> {
> 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> 	struct ieee80211_sta_bss *bss;
>@@ -2082,6 +2087,7 @@
> 	atomic_inc(&bss->users);
> 	atomic_inc(&bss->users);
> 	memcpy(bss->bssid, bssid, ETH_ALEN);
>+	bss->channel = channel;
> 
> 	spin_lock_bh(&local->sta_bss_lock);
> 	/* TODO: order by RSSI? */
>@@ -2093,7 +2099,7 @@
> 
> 
> static struct ieee80211_sta_bss *
>-ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid)
>+ieee80211_rx_bss_get(struct net_device *dev, u8 *bssid, int channel)
> {
> 	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> 	struct ieee80211_sta_bss *bss;
>@@ -2101,7 +2107,8 @@
> 	spin_lock_bh(&local->sta_bss_lock);
> 	bss = local->sta_bss_hash[STA_HASH(bssid)];
> 	while (bss) {
>-		if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0) {
>+		if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0 &&
>+		    bss->channel == channel) {
> 			atomic_inc(&bss->users);
> 			break;
> 		}
>@@ -2270,9 +2277,9 @@
> 	else
> 		channel = rx_status->channel;
> 
>-	bss = ieee80211_rx_bss_get(dev, mgmt->bssid);
>+	bss = ieee80211_rx_bss_get(dev, mgmt->bssid, channel);
> 	if (!bss) {
>-		bss = ieee80211_rx_bss_add(dev, mgmt->bssid);
>+		bss = ieee80211_rx_bss_add(dev, mgmt->bssid, channel);
> 		if (!bss)
> 			return;
> 	} else {
>@@ -2389,7 +2396,6 @@
> 	}
> 
> 	bss->hw_mode = rx_status->phymode;
>-	bss->channel = channel;
> 	bss->freq = rx_status->freq;
> 	if (channel != rx_status->channel &&
> 	    (bss->hw_mode == MODE_IEEE80211G ||
>@@ -3345,7 +3351,7 @@
> 	printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID " MAC_FMT "\n",
> 	       dev->name, MAC_ARG(bssid));
> 
>-	bss = ieee80211_rx_bss_add(dev, bssid);
>+	bss = ieee80211_rx_bss_add(dev, bssid, local->hw.conf.channel);
> 	if (!bss)
> 		return -ENOMEM;
> 
>@@ -3356,7 +3362,6 @@
> 		local->hw.conf.beacon_int = 100;
> 	bss->beacon_int = local->hw.conf.beacon_int;
> 	bss->hw_mode = local->hw.conf.phymode;
>-	bss->channel = local->hw.conf.channel;
> 	bss->freq = local->hw.conf.freq;
> 	bss->last_update = jiffies;
> 	bss->capability = WLAN_CAPABILITY_IBSS;
>@@ -3416,7 +3421,7 @@
> 	       MAC_FMT "\n", MAC_ARG(bssid), MAC_ARG(ifsta->bssid));
> #endif /* CONFIG_MAC80211_IBSS_DEBUG */
> 	if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0 &&
>-	    (bss = ieee80211_rx_bss_get(dev, bssid))) {
>+	    (bss = ieee80211_rx_bss_get(dev, bssid, local->hw.conf.channel))) {
> 		printk(KERN_DEBUG "%s: Selected IBSS BSSID " MAC_FMT
> 		       " based on configured SSID\n",
> 		       dev->name, MAC_ARG(bssid));

Actions: View | Diff

Attachments on bug 250913: 161683 | 161736 | 161770 | 203631