madwifi: fix a race condition in the ibss merge

SVN-Revision: 16870

diff --git a/package/madwifi/patches/441-fix_ibss_node_handling.patch b/package/madwifi/patches/441-fix_ibss_node_handling.patch
index 13f15fb727d34e2a92f5a38ddae01764dc17b989..d64ebf05924d8fa53234e4a37050a3005f604055 100644 (file)
--- a/package/madwifi/patches/441-fix_ibss_node_handling.patch
+++ b/package/madwifi/patches/441-fix_ibss_node_handling.patch
@@ -78,3 +78,13 @@
                        if (ni == NULL)
                                return;
                        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);