diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-03-31 19:22:59 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-01 17:14:09 -0400 |
| commit | 9dd6aed05b8859265cd79f1e47e4f844bbe1548b (patch) | |
| tree | 85950042a8fa65ffa8b49e60b3bbd1f6996e9469 /net | |
| parent | a2e1d52a32eab53f8ab03c4023310f65aaa054a7 (diff) | |
| download | blackbird-op-linux-9dd6aed05b8859265cd79f1e47e4f844bbe1548b.tar.gz blackbird-op-linux-9dd6aed05b8859265cd79f1e47e4f844bbe1548b.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211_sta.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index f9cf2f187893..baa68575b98a 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c @@ -2253,8 +2253,10 @@ static int ieee80211_sta_join_ibss(struct net_device *dev, 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. */ - sta_info_flush(local, NULL); + sta_info_flush(local, sdata); if (local->ops->reset_tsf) { /* 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; - sdata = IEEE80211_DEV_TO_SUB_IF(dev); sdata->drop_unencrypted = bss->capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0; |
