Changeset 36113


Ignore:
Timestamp:
2013-03-24T01:53:15+01:00 (5 years ago)
Author:
hauke
Message:

mac80211: update brcmsmac ap patches

Location:
trunk/package/mac80211/patches
Files:
2 added
5 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/862-brcmsmac-remove-brcms_bss_cfg-BSS.patch

    r35763 r36113  
    4040                                                  "wl%d: up: rfdisable -> " 
    4141                                                  "bsscfg_disable()\n", 
    42 @@ -7390,7 +7383,7 @@ void brcms_c_update_beacon(struct brcms_ 
     42@@ -7390,7 +7383,8 @@ void brcms_c_update_beacon(struct brcms_ 
    4343 { 
    4444        struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 
    4545  
    4646-       if (bsscfg->up && !bsscfg->BSS) 
    47 +       if (bsscfg->up && bsscfg->type == BRCMS_TYPE_AP) 
     47+       if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || 
     48+                          bsscfg->type == BRCMS_TYPE_ADHOC)) 
    4849                /* Clear the soft intmask */ 
    4950                wlc->defmacintmask &= ~MI_BCNTPL; 
    5051 } 
    51 @@ -7465,7 +7458,7 @@ void brcms_c_update_probe_resp(struct br 
     52@@ -7465,7 +7459,8 @@ void brcms_c_update_probe_resp(struct br 
    5253        struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 
    5354  
    5455        /* update AP or IBSS probe responses */ 
    5556-       if (bsscfg->up && !bsscfg->BSS) 
    56 +       if (bsscfg->up && bsscfg->type == BRCMS_TYPE_AP) 
     57+       if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || 
     58+                          bsscfg->type == BRCMS_TYPE_ADHOC)) 
    5759                brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend); 
    5860 } 
  • trunk/package/mac80211/patches/863-brcmsmac-remove-brcms_bss_cfg-associated.patch

    r35763 r36113  
    4747                else 
    4848                        mcsset_bss = wlc->default_bss; 
    49 @@ -7498,7 +7493,6 @@ void brcms_c_scan_stop(struct brcms_c_in 
     49@@ -7500,7 +7495,6 @@ void brcms_c_scan_stop(struct brcms_c_in 
    5050 void brcms_c_associate_upd(struct brcms_c_info *wlc, bool state) 
    5151 { 
  • trunk/package/mac80211/patches/865-brcmsmac-remove-brcms_bss_cfg-up.patch

    r35763 r36113  
    11--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    22+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    3 @@ -7377,7 +7377,7 @@ void brcms_c_update_beacon(struct brcms_ 
     3@@ -7377,8 +7377,8 @@ void brcms_c_update_beacon(struct brcms_ 
    44 { 
    55        struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 
    66  
    7 -       if (bsscfg->up && bsscfg->type == BRCMS_TYPE_AP) 
    8 +       if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) 
     7-       if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || 
     8-                          bsscfg->type == BRCMS_TYPE_ADHOC)) 
     9+       if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP || 
     10+                            bsscfg->type == BRCMS_TYPE_ADHOC)) 
    911                /* Clear the soft intmask */ 
    1012                wlc->defmacintmask &= ~MI_BCNTPL; 
    1113 } 
    12 @@ -7452,7 +7452,7 @@ void brcms_c_update_probe_resp(struct br 
     14@@ -7453,8 +7453,8 @@ void brcms_c_update_probe_resp(struct br 
    1315        struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 
    1416  
    1517        /* update AP or IBSS probe responses */ 
    16 -       if (bsscfg->up && bsscfg->type == BRCMS_TYPE_AP) 
    17 +       if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) 
     18-       if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP || 
     19-                          bsscfg->type == BRCMS_TYPE_ADHOC)) 
     20+       if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP || 
     21+                            bsscfg->type == BRCMS_TYPE_ADHOC)) 
    1822                brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend); 
    1923 } 
    2024  
    21 @@ -7805,7 +7805,7 @@ void brcms_c_init(struct brcms_c_info *w 
     25@@ -7807,7 +7807,7 @@ void brcms_c_init(struct brcms_c_info *w 
    2226        brcms_c_set_bssid(wlc->bsscfg); 
    2327  
  • trunk/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch

    r35763 r36113  
    171171  * Update all beacons for the system. 
    172172  */ 
    173 @@ -7386,9 +7494,31 @@ void brcms_c_update_beacon(struct brcms_ 
    174  { 
     173@@ -7387,9 +7495,31 @@ void brcms_c_update_beacon(struct brcms_ 
    175174        struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 
    176175  
    177 -       if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) 
    178 +       if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) { 
     176        if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP || 
     177-                            bsscfg->type == BRCMS_TYPE_ADHOC)) 
     178+                            bsscfg->type == BRCMS_TYPE_ADHOC)) { 
    179179                /* Clear the soft intmask */ 
    180180                wlc->defmacintmask &= ~MI_BCNTPL; 
     
    204204  
    205205 /* Write ssid into shared memory */ 
    206 @@ -7786,6 +7916,10 @@ bool brcms_c_dpc(struct brcms_c_info *wl 
     206@@ -7788,6 +7918,10 @@ bool brcms_c_dpc(struct brcms_c_info *wl 
    207207                brcms_rfkill_set_hw_state(wlc->wl); 
    208208        } 
     
    215215        return wlc->macintstatus != 0; 
    216216  
    217 @@ -7917,6 +8051,7 @@ brcms_c_attach(struct brcms_info *wl, st 
     217@@ -7919,6 +8053,7 @@ brcms_c_attach(struct brcms_info *wl, st 
    218218        pub->unit = unit; 
    219219        pub->_piomode = piomode; 
  • trunk/package/mac80211/patches/871-brcmsmac-add-support-for-probe-response-template.patch

    r35763 r36113  
    107107 { 
    108108        return TXOFF; 
    109 @@ -7530,6 +7469,20 @@ void brcms_c_set_new_beacon(struct brcms 
     109@@ -7531,6 +7470,20 @@ void brcms_c_set_new_beacon(struct brcms 
    110110        brcms_c_update_beacon(wlc); 
    111111 } 
     
    128128 static void 
    129129 brcms_c_shm_ssid_upd(struct brcms_c_info *wlc, struct brcms_bss_cfg *cfg) 
    130 @@ -7549,30 +7502,19 @@ brcms_c_shm_ssid_upd(struct brcms_c_info 
     130@@ -7550,30 +7503,19 @@ brcms_c_shm_ssid_upd(struct brcms_c_info 
    131131 static void 
    132132 brcms_c_bss_update_probe_resp(struct brcms_c_info *wlc, 
     
    163163        /* write the length of the probe response frame (+PLCP/-FCS) */ 
    164164        brcms_b_write_shm(wlc->hw, M_PRB_RESP_FRM_LEN, (u16) len); 
    165 @@ -7586,13 +7528,11 @@ brcms_c_bss_update_probe_resp(struct brc 
     165@@ -7587,13 +7529,11 @@ brcms_c_bss_update_probe_resp(struct brc 
    166166         * PLCP header for the call to brcms_c_mod_prb_rsp_rate_table() 
    167167         * by subtracting the PLCP len and adding the FCS. 
     
    179179  
    180180 void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend) 
    181 @@ -7600,8 +7540,12 @@ void brcms_c_update_probe_resp(struct br 
    182         struct brcms_bss_cfg *bsscfg = wlc->bsscfg; 
     181@@ -7602,8 +7542,12 @@ void brcms_c_update_probe_resp(struct br 
    183182  
    184183        /* update AP or IBSS probe responses */ 
    185 -       if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) 
     184        if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP || 
     185-                            bsscfg->type == BRCMS_TYPE_ADHOC)) 
    186186-               brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend); 
    187 +       if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) { 
     187+                            bsscfg->type == BRCMS_TYPE_ADHOC)) { 
    188188+               if (!wlc->probe_resp) 
    189189+                       return; 
  • trunk/package/mac80211/patches/873-brcmsmac-activate-AP-support.patch

    r36112 r36113  
    11--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 
    22+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c 
    3 @@ -360,7 +360,8 @@ brcms_ops_add_interface(struct ieee80211 
     3@@ -359,10 +359,11 @@ brcms_ops_add_interface(struct ieee80211 
     4 { 
    45        struct brcms_info *wl = hw->priv; 
    56  
    6         /* Just STA for now */ 
     7-       /* Just STA for now */ 
    78-       if (vif->type != NL80211_IFTYPE_STATION) { 
     9+       /* Just STA and AP for now */ 
    810+       if (vif->type != NL80211_IFTYPE_STATION && 
    911+           vif->type != NL80211_IFTYPE_AP) { 
    1012                brcms_err(wl->wlc->hw->d11core, 
    11                           "%s: Attempt to add type %d, only STA for now\n", 
     13-                         "%s: Attempt to add type %d, only STA for now\n", 
     14+                         "%s: Attempt to add type %d, only STA and AP for now\n", 
    1215                          __func__, vif->type); 
     16                return -EOPNOTSUPP; 
     17        } 
    1318@@ -372,6 +373,9 @@ brcms_ops_add_interface(struct ieee80211 
    1419        brcms_c_mute(wl->wlc, false); 
     
    2126  
    2227        return 0; 
    23 @@ -1046,7 +1050,8 @@ static int ieee_hw_init(struct ieee80211 
     28@@ -1052,7 +1056,8 @@ static int ieee_hw_init(struct ieee80211 
    2429  
    2530        /* channel change time is dependent on chip and band  */ 
     
    2934+                                    BIT(NL80211_IFTYPE_AP); 
    3035  
    31         hw->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD; 
    32   
     36        /* 
     37         * deactivate sending probe responses by ucude, because this will 
    3338--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    3439+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
Note: See TracChangeset for help on using the changeset viewer.