diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-14 21:15:45 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-14 21:15:45 +0000 |
| commit | 727e3e7538e28bb8d67dbc9fbfd669a39cad7e6d (patch) | |
| tree | a4c1d4ab8745e4438d7adbc515c9ea69bfc3a909 | |
| parent | d3a67c21f474019c9afc79bedc77ed7e78efd17f (diff) | |
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 c63901d9e..662f454ef 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); |