aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-09-28 19:35:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-09-28 19:35:56 +0000
commit02fa0bc75f70238254daf91eefa755091515cfed (patch)
tree83c0a2d204581c034cb770b0f5ec48a6397d2c9c
parent55b2a182ed437f1d4a08b43081c710f507b41a95 (diff)
downloadupstream-02fa0bc75f70238254daf91eefa755091515cfed.tar.gz
upstream-02fa0bc75f70238254daf91eefa755091515cfed.tar.bz2
upstream-02fa0bc75f70238254daf91eefa755091515cfed.zip
madwifi: revert part of the noderef fix patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12771 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/madwifi/patches/380-noderef_fix.patch19
1 files changed, 0 insertions, 19 deletions
diff --git a/package/madwifi/patches/380-noderef_fix.patch b/package/madwifi/patches/380-noderef_fix.patch
index 8767e1c456..fb4192ddf9 100644
--- a/package/madwifi/patches/380-noderef_fix.patch
+++ b/package/madwifi/patches/380-noderef_fix.patch
@@ -26,23 +26,4 @@
("wrong refcount for new node."));
if (obss != NULL) {
-@@ -630,6 +630,7 @@
- ieee80211_fix_rate(selbs, IEEE80211_F_DODEL);
- }
-
-+ IEEE80211_VAPS_LOCK_BH(ic);
- /*
- * Committed to selbs, setup state.
- */
-@@ -642,8 +643,9 @@
- (vap->iv_state == IEEE80211_S_RUN) && bssid_equal(obss, selbs)); */
- vap->iv_bss = selbs;
- IEEE80211_ADDR_COPY(vap->iv_bssid, selbs->ni_bssid);
-- if (obss != NULL)
-+ if ((obss != NULL) && (obss != selbs))
- ieee80211_unref_node(&obss);
-+ IEEE80211_VAPS_UNLOCK_BH(ic);
- ic->ic_bsschan = selbs->ni_chan;
- ic->ic_curchan = ic->ic_bsschan;
- ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);