mac80211: merge upstream legacy minstrel improvements

[openwrt.git] / package / mac80211 / patches / 869-brcmsmac-add-beacon-template-support.patch

diff --git a/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch b/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
index ab864a3dbf66b9041e75ef419ab59e9a696d0ab1..cbed0f1015b2aaa3a30ca63f32c24e49a4126b8a 100644 (file)
--- a/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
+++ b/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
@@ -36,7 +36,7 @@
   *
   * Permission to use, copy, modify, and/or distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
-@@ -450,6 +451,8 @@ static void brcms_c_detach_mfree(struct
+@@ -450,6 +451,8 @@ static void brcms_c_detach_mfree(struct 
        kfree(wlc->corestate);
        kfree(wlc->hw->bandstate[0]);
        kfree(wlc->hw);
@@ -170,12 +170,12 @@
  /*
   * Update all beacons for the system.
   */
-@@ -7386,9 +7494,31 @@ void brcms_c_update_beacon(struct brcms_
- {
+@@ -7387,9 +7495,31 @@ void brcms_c_update_beacon(struct brcms_
        struct brcms_bss_cfg *bsscfg = wlc->bsscfg;
  
--      if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP)
-+      if (wlc->pub->up && bsscfg->type == BRCMS_TYPE_AP) {
+       if (wlc->pub->up && (bsscfg->type == BRCMS_TYPE_AP ||
+-                           bsscfg->type == BRCMS_TYPE_ADHOC))
++                           bsscfg->type == BRCMS_TYPE_ADHOC)) {
                /* Clear the soft intmask */
                wlc->defmacintmask &= ~MI_BCNTPL;
 +              if (!wlc->beacon)
@@ -203,7 +203,7 @@
  }
  
  /* Write ssid into shared memory */
-@@ -7786,6 +7916,10 @@ bool brcms_c_dpc(struct brcms_c_info *wl
+@@ -7788,6 +7918,10 @@ bool brcms_c_dpc(struct brcms_c_info *wl
                brcms_rfkill_set_hw_state(wlc->wl);
        }
  
@@ -214,7 +214,7 @@
        /* it isn't done and needs to be resched if macintstatus is non-zero */
        return wlc->macintstatus != 0;
  
-@@ -7917,6 +8051,7 @@ brcms_c_attach(struct brcms_info *wl, st
+@@ -7919,6 +8053,7 @@ brcms_c_attach(struct brcms_info *wl, st
        pub->unit = unit;
        pub->_piomode = piomode;
        wlc->bandinit_pending = false;