Skip to contentSkip to conversation

mac80211: Remove bss information of the current AP when it goes out of range

PATCH In review Vasanthakumar Thiagarajan 2 participants 4 messages Feb 3, 2009 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mac80211: Remove bss information of the current AP when it goes out of range

There is no point having the bss information of currently associated AP when the AP is detected to be out of range.

---
 net/mac80211/mlme.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +16 -2
index 9d51e27..945c10d 100644
@@ -1042,6 +1042,7 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 	struct ieee80211_local *local = sdata->local;
 	struct sta_info *sta;
 	int disassoc;
+	bool remove_bss = false;
 
 	/* TODO: start monitoring current AP signal quality and number of
 	 * missed beacons. Scan other channels every now and then and search
@@ -1067,6 +1068,7 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 				       "range\n",
 				       sdata->dev->name, ifsta->bssid);
 				disassoc = 1;
+				remove_bss = true;
 			} else
 				ieee80211_send_probe_req(sdata, ifsta->bssid,
 							 ifsta->ssid,
@@ -1086,12 +1088,24 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 
 	rcu_read_unlock();
 
-	if (disassoc)
+	if (disassoc) {
 		ieee80211_set_disassoc(sdata, ifsta, true, true,
 					WLAN_REASON_PREV_AUTH_NOT_VALID);
-	else
+		if (remove_bss) {
+			struct ieee80211_bss *bss;
+
+			bss = ieee80211_rx_bss_get(local, ifsta->bssid,
+					local->hw.conf.channel->center_freq,
+					ifsta->ssid, ifsta->ssid_len);
+			if (bss) {
+				atomic_dec(&bss->users);
+				ieee80211_rx_bss_put(local, bss);
+			}
+		}
+	} else {
 		mod_timer(&ifsta->timer, jiffies +
 				      IEEE80211_MONITORING_INTERVAL);
+	}
 }
 
 
Signature · 1 line
1.5.5.1
maintainer
#1 lore raw
Quoted 2 lines · Vasanthakumar Thiagarajan

There is no point having the bss information of currently associated AP when the AP is detected to be out of range.

Seems sane to me. There are a few other places I think where we hold on to the bss info way too long, in fact, we hold on to it _forever_ most of the time.

Quoted 52 lines
---
 net/mac80211/mlme.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +16 -2
index 9d51e27..945c10d 100644
@@ -1042,6 +1042,7 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 	struct ieee80211_local *local = sdata->local;
 	struct sta_info *sta;
 	int disassoc;
+	bool remove_bss = false;
 
 	/* TODO: start monitoring current AP signal quality and number of
 	 * missed beacons. Scan other channels every now and then and search
@@ -1067,6 +1068,7 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 				       "range\n",
 				       sdata->dev->name, ifsta->bssid);
 				disassoc = 1;
+				remove_bss = true;
 			} else
 				ieee80211_send_probe_req(sdata, ifsta->bssid,
 							 ifsta->ssid,
@@ -1086,12 +1088,24 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
 
 	rcu_read_unlock();
 
-	if (disassoc)
+	if (disassoc) {
 		ieee80211_set_disassoc(sdata, ifsta, true, true,
 					WLAN_REASON_PREV_AUTH_NOT_VALID);
-	else
+		if (remove_bss) {
+			struct ieee80211_bss *bss;
+
+			bss = ieee80211_rx_bss_get(local, ifsta->bssid,
+					local->hw.conf.channel->center_freq,
+					ifsta->ssid, ifsta->ssid_len);
+			if (bss) {
+				atomic_dec(&bss->users);
+				ieee80211_rx_bss_put(local, bss);
+			}
+		}
+	} else {
 		mod_timer(&ifsta->timer, jiffies +
 				      IEEE80211_MONITORING_INTERVAL);
+	}
 }
 
 
#2 lore raw
Quoted 8 lines · Johannes Berg
Quoted 2 lines · Vasanthakumar Thiagarajan

There is no point having the bss information of currently associated AP when the AP is detected to be out of range.

Seems sane to me. There are a few other places I think where we hold on to the bss info way too long, in fact, we hold on to it _forever_ most of the time.

Yeah, we hold bss info when we get direct probe timeout, auth timeout and assoc timeout. I will remove bss in those places also n the next version.

Thanks,

Vasanth

maintainer
#3 lore raw
Quoted 5 lines · Vasanthakumar Thiagarajan
Quoted 4 lines · Johannes Berg
Quoted 2 lines · Vasanthakumar Thiagarajan

There is no point having the bss information of currently associated AP when the AP is detected to be out of range.

Quoted 7 lines
Quoted 4 lines

Seems sane to me. There are a few other places I think where we hold on to the bss info way too long, in fact, we hold on to it _forever_ most of the time.

Yeah, we hold bss info when we get direct probe timeout, auth timeout and assoc timeout. I will remove bss in those places also n the next version.

Not just that, but also when we've found a BSS and never connect to it, we'll never time it out. It's nothing you need to fix though, I'm perfectly ok with just putting this patch in as a start.

johannes