merge r17576 to 8.09
authorFelix Fietkau <nbd@openwrt.org>
Mon, 14 Sep 2009 10:41:17 +0000 (10:41 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 14 Sep 2009 10:41:17 +0000 (10:41 +0000)
SVN-Revision: 17577

package/madwifi/patches/441-fix_ibss_node_handling.patch
package/madwifi/patches/443-tx_drop_counter.patch

index 5035ae4..5894d68 100644 (file)
        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 */
index ce8a809..30630ae 100644 (file)
@@ -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
                        }