aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-03-24 00:53:15 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-03-24 00:53:15 +0000
commit72b5d58a2a25b47122e2b9fe96fcc9822af2ccf1 (patch)
treeeea85b6d34de53fa74bdbef0c092991a92afa7ab /package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
parent513de712f95b37b55c5dba759893a1d8e74ea438 (diff)
downloadupstream-72b5d58a2a25b47122e2b9fe96fcc9822af2ccf1.tar.gz
upstream-72b5d58a2a25b47122e2b9fe96fcc9822af2ccf1.tar.bz2
upstream-72b5d58a2a25b47122e2b9fe96fcc9822af2ccf1.zip
mac80211: update brcmsmac ap patches
SVN-Revision: 36113
Diffstat (limited to 'package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch')
-rw-r--r--package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch12
1 files changed, 6 insertions, 6 deletions
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 ab864a3dbf..7ea09a8540 100644
--- a/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
+++ b/package/mac80211/patches/869-brcmsmac-add-beacon-template-support.patch
@@ -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;