aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-07-16 17:41:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-07-16 17:41:51 +0000
commit5cc4951745c4f3e9f342e2df3422384a71b0aa01 (patch)
treebf73ef2d02f840c0038ecef244b2f7040a7c2cfb
parent9224ef1e25a140b61831ed27c0db7ec8e1499a78 (diff)
downloadupstream-5cc4951745c4f3e9f342e2df3422384a71b0aa01.tar.gz
upstream-5cc4951745c4f3e9f342e2df3422384a71b0aa01.tar.bz2
upstream-5cc4951745c4f3e9f342e2df3422384a71b0aa01.zip
madwifi: fix a race condition in the ibss merge
SVN-Revision: 16870
-rw-r--r--package/madwifi/patches/441-fix_ibss_node_handling.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/package/madwifi/patches/441-fix_ibss_node_handling.patch b/package/madwifi/patches/441-fix_ibss_node_handling.patch
index 13f15fb727..d64ebf0592 100644
--- 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);