summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-02-10 11:03:48 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-18 20:52:36 (GMT)
commitd8a1fb44abc3e022419ecf8c51acf53b9b78e848 (patch)
treee87ac986fc5473de2ee8e8b32882a4ab2ba01842 /drivers
parent4191e2d56458cdc9a31de68c8a8ff55a04242f9c (diff)
downloadlinux-fsl-qoriq-d8a1fb44abc3e022419ecf8c51acf53b9b78e848.tar.xz
staging: brcm80211: handle change in association state from mac80211
The driver has flags for association state which are now being set according to notification from mac80211. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Brett Rudley <brudley@broadcom.com> Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wl_mac80211.c1
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c6
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_pub.h1
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index e485280..a51e511 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -333,6 +333,7 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
*/
WL_ERROR("%s: %s: %sassociated\n", KBUILD_MODNAME, __func__,
info->assoc ? "" : "dis");
+ wlc_associate_upd(wl->wlc, info->assoc);
}
if (changed & BSS_CHANGED_ERP_CTS_PROT) {
/* CTS protection changed */
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index d2b86a6..76d78c1 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -8590,3 +8590,9 @@ void wlc_scan_stop(struct wlc_info *wlc)
{
wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, false);
}
+
+void wlc_associate_upd(struct wlc_info *wlc, bool state)
+{
+ wlc->pub->associated = state;
+ wlc->cfg->associated = state;
+}
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
index 4d0e0b13..4b43c3c 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
@@ -563,6 +563,7 @@ extern void wlc_enable_mac(struct wlc_info *wlc);
extern u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate);
extern u32 wlc_get_rspec_history(struct wlc_bsscfg *cfg);
extern u32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg);
+extern void wlc_associate_upd(struct wlc_info *wlc, bool state);
extern void wlc_scan_start(struct wlc_info *wlc);
extern void wlc_scan_stop(struct wlc_info *wlc);