From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 28 Sep 2008 19:35:56 +0000 (+0000)
Subject: madwifi: revert part of the noderef fix patch
X-Git-Tag: reboot~25487
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=72fd7feb0da34dc093c75be6357d7c42bb9fe324;p=openwrt%2Fstaging%2Fpepe2k.git

madwifi: revert part of the noderef fix patch

SVN-Revision: 12771
---

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);