Changeset 49406


Ignore:
Timestamp:
2016-09-28T00:02:08+02:00 (12 months ago)
Author:
rmilecki
Message:

mac80211: brcmfmac: backport patches that were skipped previously #2

Signed-off-by: Rafał Miłecki <rafal@…>

Location:
branches/chaos_calmer/package/kernel/mac80211/patches
Files:
12 added
12 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch

    r49405 r49406  
    7777--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    7878+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    79 @@ -938,30 +938,6 @@ void brcmf_remove_interface(struct brcmf 
     79@@ -753,30 +753,6 @@ void brcmf_remove_interface(struct brcmf 
    8080        brcmf_del_if(ifp->drvr, ifp->bsscfgidx); 
    8181 } 
     
    110110--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h 
    111111+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h 
    112 @@ -221,7 +221,6 @@ int brcmf_net_attach(struct brcmf_if *if 
     112@@ -217,7 +217,6 @@ int brcmf_net_attach(struct brcmf_if *if 
    113113 struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, 
    114114                              bool is_p2pdev, char *name, u8 *mac_addr); 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch

    r49405 r49406  
    5555        brcmf_dbg(CONN, "beacon interval: %d\n", notify_interval); 
    5656        brcmf_dbg(CONN, "signal: %d\n", notify_signal); 
    57 @@ -5234,7 +5234,7 @@ brcmf_bss_roaming_done(struct brcmf_cfg8 
     57@@ -5235,7 +5235,7 @@ brcmf_bss_roaming_done(struct brcmf_cfg8 
    5858        else 
    5959                band = wiphy->bands[IEEE80211_BAND_5GHZ]; 
     
    6464  
    6565 done: 
    66 @@ -5756,14 +5756,15 @@ static int brcmf_construct_chaninfo(stru 
     66@@ -5757,14 +5757,15 @@ static int brcmf_construct_chaninfo(stru 
    6767                channel = band->channels; 
    6868                index = band->n_channels; 
     
    8383                /* assuming the chanspecs order is HT20, 
    8484                 * HT40 upper, HT40 lower, and VHT80. 
    85 @@ -5865,7 +5866,7 @@ static int brcmf_enable_bw40_2g(struct b 
     85@@ -5866,7 +5867,7 @@ static int brcmf_enable_bw40_2g(struct b 
    8686                        if (WARN_ON(ch.bw != BRCMU_CHAN_BW_40)) 
    8787                                continue; 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch

    r49405 r49406  
    1616--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    1717+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    18 @@ -4846,6 +4846,68 @@ exit: 
     18@@ -4847,6 +4847,68 @@ exit: 
    1919        return err; 
    2020 } 
     
    8585                                           struct wireless_dev *wdev, 
    8686                                           enum nl80211_crit_proto_id proto, 
    87 @@ -5008,6 +5070,7 @@ static struct cfg80211_ops brcmf_cfg8021 
     87@@ -5009,6 +5071,7 @@ static struct cfg80211_ops brcmf_cfg8021 
    8888        .mgmt_tx = brcmf_cfg80211_mgmt_tx, 
    8989        .remain_on_channel = brcmf_p2p_remain_on_channel, 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch

    r49405 r49406  
    3333--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    3434+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    35 @@ -4381,7 +4381,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     35@@ -4382,7 +4382,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    3636        struct brcmf_join_params join_params; 
    3737        enum nl80211_iftype dev_role; 
     
    4242        int is_11d; 
    4343  
    44 @@ -4457,16 +4457,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     44@@ -4458,16 +4458,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    4545  
    4646        brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon); 
     
    6060                        err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY, 
    6161                                                    is_11d); 
    62 @@ -4514,6 +4506,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     62@@ -4515,6 +4507,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    6363                err = -EINVAL; 
    6464                goto exit; 
     
    6969                if ((brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) && (!mbss)) 
    7070                        brcmf_fil_iovar_int_set(ifp, "mbss", 1); 
    71 @@ -4523,6 +4517,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     71@@ -4524,6 +4518,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    7272                        brcmf_err("setting AP mode failed %d\n", err); 
    7373                        goto exit; 
     
    8787                if (err < 0) { 
    8888                        brcmf_err("BRCMF_C_UP error (%d)\n", err); 
    89 @@ -4544,7 +4549,13 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     89@@ -4545,7 +4550,13 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    9090                        goto exit; 
    9191                } 
     
    102102                                                sizeof(ssid_le)); 
    103103                if (err < 0) { 
    104 @@ -4561,7 +4572,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     104@@ -4562,7 +4573,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    105105                } 
    106106  
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch

    r49405 r49406  
    4242--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    4343+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    44 @@ -5371,7 +5371,6 @@ brcmf_notify_connect_status_ap(struct br 
     44@@ -5372,7 +5372,6 @@ brcmf_notify_connect_status_ap(struct br 
    4545                               struct net_device *ndev, 
    4646                               const struct brcmf_event_msg *e, void *data) 
     
    5050        u32 event = e->event_code; 
    5151        u32 reason = e->reason; 
    52 @@ -5382,8 +5381,6 @@ brcmf_notify_connect_status_ap(struct br 
     52@@ -5383,8 +5382,6 @@ brcmf_notify_connect_status_ap(struct br 
    5353            ndev != cfg_to_ndev(cfg)) { 
    5454                brcmf_dbg(CONN, "AP mode link down\n"); 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch

    r49405 r49406  
    2525                return (struct wireless_dev *)vif; 
    2626  
    27 @@ -5097,8 +5097,7 @@ static struct cfg80211_ops brcmf_cfg8021 
     27@@ -5098,8 +5098,7 @@ static struct cfg80211_ops brcmf_cfg8021 
    2828 }; 
    2929  
     
    3535        struct brcmf_cfg80211_vif *vif_walk; 
    3636        struct brcmf_cfg80211_vif *vif; 
    37 @@ -5113,8 +5112,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v 
     37@@ -5114,8 +5113,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v 
    3838        vif->wdev.wiphy = cfg->wiphy; 
    3939        vif->wdev.iftype = type; 
     
    4444  
    4545        if (type == NL80211_IFTYPE_AP) { 
    46 @@ -6753,7 +6750,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802 
     46@@ -6754,7 +6751,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802 
    4747        init_vif_event(&cfg->vif_event); 
    4848        INIT_LIST_HEAD(&cfg->vif_list); 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch

    r49405 r49406  
    2424--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    2525+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    26 @@ -6207,29 +6207,15 @@ static int brcmf_setup_ifmodes(struct wi 
     26@@ -6208,29 +6208,15 @@ static int brcmf_setup_ifmodes(struct wi 
    2727        if (!combo) 
    2828                goto err; 
     
    5757        c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION); 
    5858        if (p2p) { 
    59 @@ -6247,6 +6233,7 @@ static int brcmf_setup_ifmodes(struct wi 
     59@@ -6248,6 +6234,7 @@ static int brcmf_setup_ifmodes(struct wi 
    6060                c0_limits[i].max = 1; 
    6161                c0_limits[i++].types = BIT(NL80211_IFTYPE_AP); 
     
    6565        combo[c].n_limits = i; 
    6666        combo[c].limits = c0_limits; 
    67 @@ -6254,7 +6241,9 @@ static int brcmf_setup_ifmodes(struct wi 
     67@@ -6255,7 +6242,9 @@ static int brcmf_setup_ifmodes(struct wi 
    6868        if (p2p) { 
    6969                c++; 
     
    7676                p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION); 
    7777                p2p_limits[i].max = 1; 
    78 @@ -6263,6 +6252,7 @@ static int brcmf_setup_ifmodes(struct wi 
     78@@ -6264,6 +6253,7 @@ static int brcmf_setup_ifmodes(struct wi 
    7979                p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT); 
    8080                p2p_limits[i].max = 1; 
     
    8484                combo[c].n_limits = i; 
    8585                combo[c].limits = p2p_limits; 
    86 @@ -6270,14 +6260,19 @@ static int brcmf_setup_ifmodes(struct wi 
     86@@ -6271,14 +6261,19 @@ static int brcmf_setup_ifmodes(struct wi 
    8787  
    8888        if (mbss) { 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch

    r49405 r49406  
    3030--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    3131+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    32 @@ -733,12 +733,16 @@ fail: 
     32@@ -548,12 +548,16 @@ fail: 
    3333        return -EBADE; 
    3434 } 
     
    5151  
    5252 void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on) 
    53 @@ -836,7 +840,7 @@ struct brcmf_if *brcmf_add_if(struct brc 
     53@@ -651,7 +655,7 @@ struct brcmf_if *brcmf_add_if(struct brc 
    5454                        brcmf_err("ERROR: netdev:%s already exists\n", 
    5555                                  ifp->ndev->name); 
     
    6060                } else { 
    6161                        brcmf_dbg(INFO, "netdev:%s ignore IF event\n", 
    62 @@ -884,7 +888,8 @@ struct brcmf_if *brcmf_add_if(struct brc 
     62@@ -699,7 +703,8 @@ struct brcmf_if *brcmf_add_if(struct brc 
    6363        return ifp; 
    6464 } 
     
    7070        struct brcmf_if *ifp; 
    7171  
    72 @@ -914,7 +919,7 @@ static void brcmf_del_if(struct brcmf_pu 
     72@@ -729,7 +734,7 @@ static void brcmf_del_if(struct brcmf_pu 
    7373                        cancel_work_sync(&ifp->multicast_work); 
    7474                        cancel_work_sync(&ifp->ndoffload_work); 
     
    7979                /* Only p2p device interfaces which get dynamically created 
    8080                 * end up here. In this case the p2p module should be informed 
    81 @@ -928,14 +933,14 @@ static void brcmf_del_if(struct brcmf_pu 
     81@@ -743,14 +748,14 @@ static void brcmf_del_if(struct brcmf_pu 
    8282        } 
    8383 } 
     
    9696  
    9797 #ifdef CONFIG_INET 
    98 @@ -1242,9 +1247,9 @@ fail: 
     98@@ -1057,9 +1062,9 @@ fail: 
    9999                brcmf_fws_deinit(drvr); 
    100100        } 
     
    108108        drvr->iflist[1] = NULL; 
    109109        if (drvr->settings->ignore_probe_fail) 
    110 @@ -1313,7 +1318,7 @@ void brcmf_detach(struct device *dev) 
     110@@ -1128,7 +1133,7 @@ void brcmf_detach(struct device *dev) 
    111111  
    112112        /* make sure primary interface removed last */ 
     
    119119--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h 
    120120+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h 
    121 @@ -220,7 +220,7 @@ struct brcmf_if *brcmf_get_ifp(struct br 
     121@@ -216,7 +216,7 @@ struct brcmf_if *brcmf_get_ifp(struct br 
    122122 int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked); 
    123123 struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0021-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch

    r49405 r49406  
    1818--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    1919+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    20 @@ -823,7 +823,7 @@ fail: 
     20@@ -638,7 +638,7 @@ fail: 
    2121 } 
    2222  
     
    2929--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h 
    3030+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h 
    31 @@ -219,7 +219,7 @@ char *brcmf_ifname(struct brcmf_if *ifp) 
     31@@ -215,7 +215,7 @@ char *brcmf_ifname(struct brcmf_if *ifp) 
    3232 struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx); 
    3333 int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked); 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0026-brcmfmac-respect-hidden_ssid-for-AP-interfaces.patch

    r49405 r49406  
    1515--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    1616+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
    17 @@ -4585,6 +4585,15 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
     17@@ -4586,6 +4586,15 @@ brcmf_cfg80211_start_ap(struct wiphy *wi 
    1818                        brcmf_err("SET SSID error (%d)\n", err); 
    1919                        goto exit; 
     
    3131        } else if (dev_role == NL80211_IFTYPE_P2P_GO) { 
    3232                err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec); 
    33 @@ -4643,6 +4652,10 @@ static int brcmf_cfg80211_stop_ap(struct 
     33@@ -4644,6 +4653,10 @@ static int brcmf_cfg80211_stop_ap(struct 
    3434                        return err; 
    3535                } 
  • branches/chaos_calmer/package/kernel/mac80211/patches/351-0027-brcmfmac-restore-stopping-netdev-queue-when-bus-clog.patch

    r49402 r49406  
    2424--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c 
    2525+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c 
    26 @@ -2260,10 +2260,22 @@ void brcmf_fws_bustxfail(struct brcmf_fw 
     26@@ -2469,10 +2469,22 @@ void brcmf_fws_bustxfail(struct brcmf_fw 
    2727 void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked) 
    2828 { 
  • branches/chaos_calmer/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch

    r49405 r49406  
    1414--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    1515+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 
    16 @@ -1398,6 +1398,7 @@ int __init brcmf_core_init(void) 
     16@@ -1213,6 +1213,7 @@ int __init brcmf_core_init(void) 
    1717 { 
    1818        if (!schedule_work(&brcmf_driver_work)) 
Note: See TracChangeset for help on using the changeset viewer.