Ignore:
Timestamp:
2011-03-30T14:37:36+02:00 (5 years ago)
Author:
nbd
Message:

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

File:
1 moved

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch

    r26365 r26370  
    11--- a/net/mac80211/rx.c 
    22+++ b/net/mac80211/rx.c 
    3 @@ -1582,7 +1582,7 @@ ieee80211_drop_unencrypted_mgmt(struct i 
     3@@ -1584,7 +1584,7 @@ ieee80211_drop_unencrypted_mgmt(struct i 
    44 } 
    55  
     
    1010        struct ieee80211_sub_if_data *sdata = rx->sdata; 
    1111        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; 
    12 @@ -1590,6 +1590,7 @@ __ieee80211_data_to_8023(struct ieee8021 
     12@@ -1592,6 +1592,7 @@ __ieee80211_data_to_8023(struct ieee8021 
    1313        struct ethhdr *ehdr; 
    1414        int ret; 
     
    1818            sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) 
    1919                return -1; 
    20 @@ -1608,11 +1609,14 @@ __ieee80211_data_to_8023(struct ieee8021 
     20@@ -1610,11 +1611,14 @@ __ieee80211_data_to_8023(struct ieee8021 
    2121                return -1; 
    2222  
     
    3535  
    3636        return 0; 
    37 @@ -1913,6 +1917,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
     37@@ -1915,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
    3838        struct net_device *dev = sdata->dev; 
    3939        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; 
     
    4343  
    4444        if (unlikely(!ieee80211_is_data(hdr->frame_control))) 
    45 @@ -1929,13 +1934,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
     45@@ -1931,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
    4646            sdata->vif.type == NL80211_IFTYPE_AP) 
    4747                return RX_DROP_MONITOR; 
Note: See TracChangeset for help on using the changeset viewer.