diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-10-14 21:15:45 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-10-14 21:15:45 +0000 |
commit | a08809bb4f4f4c2a0a9b83078dc6be49a0092510 (patch) | |
tree | a4c1d4ab8745e4438d7adbc515c9ea69bfc3a909 | |
parent | e3037fc6b70eaed6f25a3abfaf25e66d7952ec0f (diff) | |
download | master-187ad058-a08809bb4f4f4c2a0a9b83078dc6be49a0092510.tar.gz master-187ad058-a08809bb4f4f4c2a0a9b83078dc6be49a0092510.tar.bz2 master-187ad058-a08809bb4f4f4c2a0a9b83078dc6be49a0092510.zip |
madwifi: fix another ibss crash (#5935)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18048 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/madwifi/patches/451-ibss_race_fix.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/package/madwifi/patches/451-ibss_race_fix.patch b/package/madwifi/patches/451-ibss_race_fix.patch index c63901d9e8..662f454eff 100644 --- a/package/madwifi/patches/451-ibss_race_fix.patch +++ b/package/madwifi/patches/451-ibss_race_fix.patch @@ -10,3 +10,25 @@ ni_or_null = ieee80211_find_node(&ic->ic_sta, wh->i_addr2); if (ni_or_null) ni = ni_or_null; +--- a/net80211/ieee80211_node.c ++++ b/net80211/ieee80211_node.c +@@ -317,16 +317,10 @@ ieee80211_create_ibss(struct ieee80211va + /* Check to see if we already have a node for this mac + * NB: we gain a node reference here + */ +- ni = ieee80211_find_txnode(vap, vap->iv_myaddr); ++ ni = ieee80211_alloc_node(vap, vap->iv_myaddr); + if (ni == NULL) { +- ni = ieee80211_alloc_node_table(vap, vap->iv_myaddr); +- IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC, +- "%s: ni:%p allocated for " MAC_FMT "\n", +- __func__, ni, MAC_ADDR(vap->iv_myaddr)); +- if (ni == NULL) { +- /* XXX recovery? */ +- return; +- } ++ /* XXX recovery? */ ++ return; + } + + IEEE80211_ADDR_COPY(ni->ni_bssid, vap->iv_myaddr); |