diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 17:17:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 17:17:56 +0000 |
| commit | 8e6a4de873c33528a3c96977460dfcd1ebb8e400 (patch) | |
| tree | 75f0c64e04d908adf380c78922aab4250d6f32c2 /package/mac80211/patches/300-pending_work.patch | |
| parent | d824020e25077f6659e76a5057ec2af3e21ee0e7 (diff) | |
| download | upstream-8e6a4de873c33528a3c96977460dfcd1ebb8e400.tar.gz upstream-8e6a4de873c33528a3c96977460dfcd1ebb8e400.tar.bz2 upstream-8e6a4de873c33528a3c96977460dfcd1ebb8e400.zip | |
mac80211: fix WPA auth on WDS station interfaces (#9227)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26609 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index cf4272d92b..74acba566e 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -170,7 +170,7 @@ if (ieee80211_has_a4(hdr->frame_control) && sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) return -1; -@@ -1611,12 +1612,16 @@ __ieee80211_data_to_8023(struct ieee8021 +@@ -1611,11 +1612,13 @@ __ieee80211_data_to_8023(struct ieee8021 return -1; ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type); @@ -180,17 +180,13 @@ ehdr = (struct ethhdr *) rx->skb->data; - if (ehdr->h_proto != rx->sdata->control_port_protocol) -- return -1; -+ if (ehdr->h_proto == rx->sdata->control_port_protocol) { ++ if (ehdr->h_proto == rx->sdata->control_port_protocol) + *port_control = true; -+ -+ if (check_port_control) -+ return -1; -+ } ++ else if (check_port_control) + return -1; return 0; - } -@@ -1916,6 +1921,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ +@@ -1916,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ struct net_device *dev = sdata->dev; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; __le16 fc = hdr->frame_control; @@ -198,7 +194,7 @@ int err; if (unlikely(!ieee80211_is_data(hdr->frame_control))) -@@ -1932,13 +1938,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ +@@ -1932,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ sdata->vif.type == NL80211_IFTYPE_AP) return RX_DROP_MONITOR; |