From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 14 Sep 2009 10:41:17 +0000 (+0000)
Subject: merge r17576 to 8.09
X-Git-Tag: 8.09.2~51
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0dfb6f9e192cd0a9c2cdc74965d54f00d66dea3e;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r17576 to 8.09

SVN-Revision: 17577
---

diff --git a/package/madwifi/patches/441-fix_ibss_node_handling.patch b/package/madwifi/patches/441-fix_ibss_node_handling.patch
index 5035ae401b..5894d68d52 100644
--- a/package/madwifi/patches/441-fix_ibss_node_handling.patch
+++ b/package/madwifi/patches/441-fix_ibss_node_handling.patch
@@ -89,14 +89,3 @@
  	return ieee80211_sta_join1(ieee80211_ref_node(ni));
  }
  EXPORT_SYMBOL(ieee80211_ibss_merge);
-@@ -1378,9 +1380,7 @@ ieee80211_add_neighbor(struct ieee80211v
- 		if (sp->ath != NULL)
- 			ieee80211_saveath(ni, sp->ath);
- 
--		/* NB: must be after ni_chan is setup */
--		ieee80211_setup_rates(ni, sp->rates, sp->xrates, IEEE80211_F_DOSORT);
--
-+		memcpy(&ni->ni_rates, &vap->iv_bss->ni_rates, sizeof(ni->ni_rates));
- 		if (ic->ic_newassoc != NULL)
- 			ic->ic_newassoc(ni, 1);
- 		/* XXX not right for 802.1x/WPA */
diff --git a/package/madwifi/patches/443-tx_drop_counter.patch b/package/madwifi/patches/443-tx_drop_counter.patch
index ce8a809266..30630ae43c 100644
--- a/package/madwifi/patches/443-tx_drop_counter.patch
+++ b/package/madwifi/patches/443-tx_drop_counter.patch
@@ -1,6 +1,6 @@
 --- a/net80211/ieee80211_node.c
 +++ b/net80211/ieee80211_node.c
-@@ -1590,10 +1590,6 @@ found:
+@@ -1592,10 +1592,6 @@ found:
  				ieee80211_ref_node(ni);
  #endif
  			}