From cf7cf41639c0f70201b49d30be156ee18cd33ea3 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 20 Jan 2011 23:35:21 +0000 Subject: mac80211: update to wireless-testing 2010-01-19 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25053 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/560-mac80211_wds_sta_fix.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 package/mac80211/patches/560-mac80211_wds_sta_fix.patch (limited to 'package/mac80211/patches/560-mac80211_wds_sta_fix.patch') diff --git a/package/mac80211/patches/560-mac80211_wds_sta_fix.patch b/package/mac80211/patches/560-mac80211_wds_sta_fix.patch deleted file mode 100644 index ba04a6fc3..000000000 --- a/package/mac80211/patches/560-mac80211_wds_sta_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -1556,17 +1556,36 @@ __ieee80211_data_to_8023(struct ieee8021 - { - struct ieee80211_sub_if_data *sdata = rx->sdata; - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; -+ bool check_port_control = false; -+ struct ethhdr *ehdr; -+ int ret; - - if (ieee80211_has_a4(hdr->frame_control) && - sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) - return -1; - -+ if (sdata->vif.type == NL80211_IFTYPE_STATION && -+ !!sdata->u.mgd.use_4addr != !!ieee80211_has_a4(hdr->frame_control)) { -+ -+ if (!sdata->u.mgd.use_4addr) -+ return -1; -+ else -+ check_port_control = true; -+ } -+ - if (is_multicast_ether_addr(hdr->addr1) && -- ((sdata->vif.type == NL80211_IFTYPE_AP_VLAN && sdata->u.vlan.sta) || -- (sdata->vif.type == NL80211_IFTYPE_STATION && sdata->u.mgd.use_4addr))) -+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN && sdata->u.vlan.sta) -+ return -1; -+ -+ ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type); -+ if (ret < 0 || !check_port_control) -+ return ret; -+ -+ ehdr = (struct ethhdr *) rx->skb->data; -+ if (ehdr->h_proto != rx->sdata->control_port_protocol) - return -1; - -- return ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type); -+ return 0; - } - - /* -- cgit v1.2.3