From d05a67923b65b0b09dff8754728e53effa0d3509 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 16 Jul 2009 17:41:51 +0000 Subject: madwifi: fix a race condition in the ibss merge git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16870 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/madwifi/patches/441-fix_ibss_node_handling.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) 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); -- cgit v1.2.3