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 5035ae401b21e7e3b3bda137159f196b9f3489ec..5894d68d5239238322561a1646ca0eb39589717d 100644 (file)
--- 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 ce8a8092667691e2f883d96a829e874bcf1ab31d..30630ae43c8898d8815491b2f9ada83b360e4b12 100644 (file)
--- 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
                        }