backport mac80211, hostapd, iw, crda from trunk as of r26369

[openwrt-10.03/.git] / package / mac80211 / patches / 530-mac80211_redirect_vlan_eap_frames.patch

diff --git a/package/mac80211/patches/580-mac80211_redirect_vlan_eap_frames.patch b/package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch
similarity index 84%
rename from package/mac80211/patches/580-mac80211_redirect_vlan_eap_frames.patch
rename to package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch
index 03a4fe5d37bc38c2cd9ef2c1f97e214f3522420c..c956a20580d0e78636c5999709a732e95090bf47 100644 (file)
--- a/package/mac80211/patches/580-mac80211_redirect_vlan_eap_frames.patch
+++ b/package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -1582,7 +1582,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
+@@ -1584,7 +1584,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
  }
  
  static int
@@ -9,7 +9,7 @@
  {
        struct ieee80211_sub_if_data *sdata = rx->sdata;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
-@@ -1590,6 +1590,7 @@ __ieee80211_data_to_8023(struct ieee8021
+@@ -1592,6 +1592,7 @@ __ieee80211_data_to_8023(struct ieee8021
        struct ethhdr *ehdr;
        int ret;
  
@@ -17,7 +17,7 @@
        if (ieee80211_has_a4(hdr->frame_control) &&
            sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
                return -1;
-@@ -1608,11 +1609,14 @@ __ieee80211_data_to_8023(struct ieee8021
+@@ -1610,11 +1611,14 @@ __ieee80211_data_to_8023(struct ieee8021
                return -1;
  
        ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
@@ -34,7 +34,7 @@
                return -1;
  
        return 0;
-@@ -1913,6 +1917,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
+@@ -1915,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;
@@ -42,7 +42,7 @@
        int err;
  
        if (unlikely(!ieee80211_is_data(hdr->frame_control)))
-@@ -1929,13 +1934,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
+@@ -1931,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
            sdata->vif.type == NL80211_IFTYPE_AP)
                return RX_DROP_MONITOR;