mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 10:57:23 +02:00
madwifi: fix a race condition in the ibss merge
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16870 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
31abfec66a
commit
d05a67923b
@ -78,3 +78,13 @@
|
|||||||
if (ni == NULL)
|
if (ni == NULL)
|
||||||
return;
|
return;
|
||||||
allocbs = 1;
|
allocbs = 1;
|
||||||
|
--- a/net80211/ieee80211_node.c
|
||||||
|
+++ b/net80211/ieee80211_node.c
|
||||||
|
@@ -601,6 +601,7 @@ ieee80211_ibss_merge(struct ieee80211_no
|
||||||
|
ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long",
|
||||||
|
ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
|
||||||
|
ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "");
|
||||||
|
+ ieee80211_node_table_reset(&vap->iv_ic->ic_sta, vap);
|
||||||
|
return ieee80211_sta_join1(ieee80211_ref_node(ni));
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(ieee80211_ibss_merge);
|
||||||
|
Loading…
Reference in New Issue
Block a user