Changeset 26610 for branches/backfire


Ignore:
Timestamp:
2011-04-12T19:19:06+02:00 (5 years ago)
Author:
nbd
Message:

mac80211: merge latest changes from trunk, fixes #9227

Location:
branches/backfire/package/mac80211/patches
Files:
16 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/patches/300-pending_work.patch

    r26536 r26610  
    171171            sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) 
    172172                return -1; 
    173 @@ -1611,12 +1612,16 @@ __ieee80211_data_to_8023(struct ieee8021 
     173@@ -1611,11 +1612,13 @@ __ieee80211_data_to_8023(struct ieee8021 
    174174                return -1; 
    175175  
     
    181181        ehdr = (struct ethhdr *) rx->skb->data; 
    182182-       if (ehdr->h_proto != rx->sdata->control_port_protocol) 
    183 -               return -1; 
    184 +       if (ehdr->h_proto == rx->sdata->control_port_protocol) { 
     183+       if (ehdr->h_proto == rx->sdata->control_port_protocol) 
    185184+               *port_control = true; 
    186 + 
    187 +               if (check_port_control) 
    188 +                       return -1; 
    189 +       } 
     185+       else if (check_port_control) 
     186                return -1; 
    190187  
    191188        return 0; 
    192  } 
    193 @@ -1916,6 +1921,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
     189@@ -1916,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
    194190        struct net_device *dev = sdata->dev; 
    195191        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; 
     
    199195  
    200196        if (unlikely(!ieee80211_is_data(hdr->frame_control))) 
    201 @@ -1932,13 +1938,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
     197@@ -1932,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_ 
    202198            sdata->vif.type == NL80211_IFTYPE_AP) 
    203199                return RX_DROP_MONITOR; 
  • branches/backfire/package/mac80211/patches/551-mac80211_fix_iftype_wds.patch

    r26536 r26610  
    11--- a/net/mac80211/rx.c 
    22+++ b/net/mac80211/rx.c 
    3 @@ -2330,13 +2330,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ 
     3@@ -2328,13 +2328,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ 
    44  
    55        if (!ieee80211_vif_is_mesh(&sdata->vif) && 
     
    1818        case cpu_to_le16(IEEE80211_STYPE_DEAUTH): 
    1919        case cpu_to_le16(IEEE80211_STYPE_DISASSOC): 
    20 @@ -2716,7 +2717,10 @@ static int prepare_for_handlers(struct i 
     20@@ -2714,7 +2715,10 @@ static int prepare_for_handlers(struct i 
    2121                } 
    2222                break; 
  • branches/backfire/package/mac80211/patches/552-mac80211_enable_iftype_wds_aggregation.patch

    r26536 r26610  
    3434--- a/net/mac80211/rx.c 
    3535+++ b/net/mac80211/rx.c 
    36 @@ -2132,7 +2132,8 @@ ieee80211_rx_h_action(struct ieee80211_r 
     36@@ -2130,7 +2130,8 @@ ieee80211_rx_h_action(struct ieee80211_r 
    3737                 */ 
    3838                if (sdata->vif.type != NL80211_IFTYPE_STATION && 
     
    4444  
    4545                /* verify action_code is present */ 
    46 @@ -2717,13 +2718,16 @@ static int prepare_for_handlers(struct i 
     46@@ -2715,13 +2716,16 @@ static int prepare_for_handlers(struct i 
    4747                } 
    4848                break; 
Note: See TracChangeset for help on using the changeset viewer.