mac80211: update brcmsmac ap patches

[openwrt/staging/mkresin.git] / package / mac80211 / patches / 865-brcmsmac-remove-brcms_bss_cfg-up.patch

diff --git a/package/mac80211/patches/865-brcmsmac-remove-brcms_bss_cfg-up.patch b/package/mac80211/patches/865-brcmsmac-remove-brcms_bss_cfg-up.patch
index 40fe6eaf6e92f817333fd683de26e9cee57f1e2e..b596d799f63f4acdf39721ff2064380159efa67a 100644 (file)
--- a/package/mac80211/patches/865-brcmsmac-remove-brcms_bss_cfg-up.patch
+++ b/package/mac80211/patches/865-brcmsmac-remove-brcms_bss_cfg-up.patch
@@ -1,24 +1,28 @@
 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -7377,7 +7377,7 @@ void brcms_c_update_beacon(struct brcms_
+@@ -7377,8 +7377,8 @@ void brcms_c_update_beacon(struct brcms_
  {
        struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
  
--      if (bsscfg->up && bsscfg->type == BRCMS_TYPE_AP)
-+      if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP)
+-      if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP ||
+-                         bsscfg->type == BRCMS_TYPE_ADHOC))
++      if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
++                           bsscfg->type == BRCMS_TYPE_ADHOC))
                /* Clear the soft intmask */
                wlc->defmacintmask &= ~MI_BCNTPL;
  }
-@@ -7452,7 +7452,7 @@ void brcms_c_update_probe_resp(struct br
+@@ -7453,8 +7453,8 @@ void brcms_c_update_probe_resp(struct br
        struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
  
        /* update AP or IBSS probe responses */
--      if (bsscfg->up && bsscfg->type == BRCMS_TYPE_AP)
-+      if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP)
+-      if (bsscfg->up && (bsscfg->type == BRCMS_TYPE_AP ||
+-                         bsscfg->type == BRCMS_TYPE_ADHOC))
++      if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
++                           bsscfg->type == BRCMS_TYPE_ADHOC))
                brcms_c_bss_update_probe_resp(wlc, bsscfg, suspend);
  }
  
-@@ -7805,7 +7805,7 @@ void brcms_c_init(struct brcms_c_info *w
+@@ -7807,7 +7807,7 @@ void brcms_c_init(struct brcms_c_info *w
        brcms_c_set_bssid(wlc->bsscfg);
  
        /* Update tsf_cfprep if associated and up */