From b30e092de65ca7be7cb277f934016484137d924c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 6 Jul 2015 16:26:34 +0000 Subject: mac80211: update to version 2015-06-22 Signed-off-by: Felix Fietkau SVN-Revision: 46198 --- ...1-don-t-look-up-destination-station-twice.patch | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 package/kernel/mac80211/patches/312-mac80211-don-t-look-up-destination-station-twice.patch (limited to 'package/kernel/mac80211/patches/312-mac80211-don-t-look-up-destination-station-twice.patch') diff --git a/package/kernel/mac80211/patches/312-mac80211-don-t-look-up-destination-station-twice.patch b/package/kernel/mac80211/patches/312-mac80211-don-t-look-up-destination-station-twice.patch deleted file mode 100644 index 02a7fab436..0000000000 --- a/package/kernel/mac80211/patches/312-mac80211-don-t-look-up-destination-station-twice.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Johannes Berg -Date: Fri, 20 Mar 2015 16:24:21 +0100 -Subject: [PATCH] mac80211: don't look up destination station twice - -There's no need to look up the destination station twice while -building the 802.11 header for a given frame if the frame will -actually be transmitted to the station we initially looked up. - -This happens for 4-addr VLAN interfaces and TDLS connections, which -both directly send the frame to the station they looked up, though -in the case of TDLS some station conditions need to be checked. - -To avoid that, add a variable indicating that we've looked up the -station that the frame is going to be transmitted to, and avoid the -lookup/flag checking if it already has been done. - -In the TDLS case, also move the authorized/wme_sta flag assignment -to the correct place, i.e. only when that station is really used. -Before this change, the new lookup should always have succeeded so -that the potentially erroneous data would be overwritten. - -Signed-off-by: Johannes Berg ---- - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -1894,6 +1894,7 @@ static struct sk_buff *ieee80211_build_h - bool wme_sta = false, authorized = false, tdls_auth = false; - bool tdls_peer = false, tdls_setup_frame = false; - bool multicast; -+ bool have_station = false; - u16 info_id = 0; - struct ieee80211_chanctx_conf *chanctx_conf; - struct ieee80211_sub_if_data *ap_sdata; -@@ -1918,6 +1919,7 @@ static struct sk_buff *ieee80211_build_h - hdrlen = 30; - authorized = test_sta_flag(sta, WLAN_STA_AUTHORIZED); - wme_sta = sta->sta.wme; -+ have_station = true; - } - ap_sdata = container_of(sdata->bss, struct ieee80211_sub_if_data, - u.ap); -@@ -2034,9 +2036,6 @@ static struct sk_buff *ieee80211_build_h - if (sdata->wdev.wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS) { - sta = sta_info_get(sdata, skb->data); - if (sta) { -- authorized = test_sta_flag(sta, -- WLAN_STA_AUTHORIZED); -- wme_sta = sta->sta.wme; - tdls_peer = test_sta_flag(sta, - WLAN_STA_TDLS_PEER); - tdls_auth = test_sta_flag(sta, -@@ -2068,6 +2067,9 @@ static struct sk_buff *ieee80211_build_h - memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN); - memcpy(hdr.addr3, sdata->u.mgd.bssid, ETH_ALEN); - hdrlen = 24; -+ have_station = true; -+ authorized = test_sta_flag(sta, WLAN_STA_AUTHORIZED); -+ wme_sta = sta->sta.wme; - } else if (sdata->u.mgd.use_4addr && - cpu_to_be16(ethertype) != sdata->control_port_protocol) { - fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS | -@@ -2130,7 +2132,7 @@ static struct sk_buff *ieee80211_build_h - * in AP mode) - */ - multicast = is_multicast_ether_addr(hdr.addr1); -- if (!multicast) { -+ if (!multicast && !have_station) { - sta = sta_info_get(sdata, hdr.addr1); - if (sta) { - authorized = test_sta_flag(sta, WLAN_STA_AUTHORIZED); -- cgit v1.2.3