aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-09-14 10:40:23 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-09-14 10:40:23 +0000
commit5f1c1dc49d28798eb441744b2af83fe5c893fd54 (patch)
tree3801b6f42cc0021eeff8253abe3ab44248652b24 /package/madwifi
parent3e9d1d75c1a16b015b70a14c9851f20c86487837 (diff)
downloadupstream-5f1c1dc49d28798eb441744b2af83fe5c893fd54.tar.gz
upstream-5f1c1dc49d28798eb441744b2af83fe5c893fd54.tar.bz2
upstream-5f1c1dc49d28798eb441744b2af83fe5c893fd54.zip
madwifi: remove an unimportant part of the ibss node handling fix, which led to a regression in ap-to-ap wds operation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17576 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi')
-rw-r--r--package/madwifi/patches/441-fix_ibss_node_handling.patch11
-rw-r--r--package/madwifi/patches/443-tx_drop_counter.patch2
2 files changed, 1 insertions, 12 deletions
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
}