UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211 ibss: flush only stations belonging to current interface 

When joining a new IBSS, all old stations are flushed, but currently
all stations belonging to all virtual interfaces are flushed, which
is wrong. This patch fixes it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2008-03-31 19:22:59 +02:00 committed by John W. Linville
parent a2e1d52a32
commit 9dd6aed05b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/ieee80211_sta.c
View File

@ -2253,8 +2253,10 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
/* Remove possible STA entries from other IBSS networks. */ /* Remove possible STA entries from other IBSS networks. */
sta_info_flush(local, NULL); sta_info_flush(local, sdata);
if (local->ops->reset_tsf) { if (local->ops->reset_tsf) {
/* Reset own TSF to allow time synchronization work. */ /* Reset own TSF to allow time synchronization work. */
@ -2267,7 +2269,6 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
local->hw.conf.beacon_int = bss->beacon_int >= 10 ? bss->beacon_int : 10; local->hw.conf.beacon_int = bss->beacon_int >= 10 ? bss->beacon_int : 10;
sdata = IEEE80211_DEV_TO_SUB_IF(dev);
sdata->drop_unencrypted = bss->capability & sdata->drop_unencrypted = bss->capability &
WLAN_CAPABILITY_PRIVACY ? 1 : 0; WLAN_CAPABILITY_PRIVACY ? 1 : 0;