Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / brcm80211 / brcmsmac / main.c

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 04192ed42527bbe5e05cca8e49a8f93e9f97f0f3..59d438409dfbe144c20dba2b71b8094859d97dd0 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -2174,6 +2174,26 @@ void brcms_c_start_station(struct brcms_c_info *wlc, u8 *addr)
        wlc->bsscfg->type = BRCMS_TYPE_STATION;
 }
 
+void brcms_c_start_ap(struct brcms_c_info *wlc, u8 *addr, const u8 *bssid,
+                     u8 *ssid, size_t ssid_len)
+{
+       brcms_c_set_ssid(wlc, ssid, ssid_len);
+
+       memcpy(wlc->pub->cur_etheraddr, addr, sizeof(wlc->pub->cur_etheraddr));
+       memcpy(wlc->bsscfg->BSSID, bssid, sizeof(wlc->bsscfg->BSSID));
+       wlc->bsscfg->type = BRCMS_TYPE_AP;
+
+       brcms_b_mctrl(wlc->hw, MCTL_AP | MCTL_INFRA, MCTL_AP | MCTL_INFRA);
+}
+
+void brcms_c_start_adhoc(struct brcms_c_info *wlc, u8 *addr)
+{
+       memcpy(wlc->pub->cur_etheraddr, addr, sizeof(wlc->pub->cur_etheraddr));
+       wlc->bsscfg->type = BRCMS_TYPE_ADHOC;
+
+       brcms_b_mctrl(wlc->hw, MCTL_AP | MCTL_INFRA, 0);
+}
+
 /* Initialize GPIOs that are controlled by D11 core */
 static void brcms_c_gpio_init(struct brcms_c_info *wlc)
 {
@@ -3062,6 +3082,12 @@ static bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
        if (wlc->filter_flags & FIF_PROMISC_IN_BSS)
                return false;
 
+       if (wlc->bsscfg->type == BRCMS_TYPE_AP)
+               return false;
+
+       if (wlc->bsscfg->type == BRCMS_TYPE_ADHOC)
+               return false;
+
        return true;
 }
 
@@ -7480,6 +7506,17 @@ void brcms_c_set_new_probe_resp(struct brcms_c_info *wlc,
        brcms_c_update_probe_resp(wlc, false);
 }
 
+void brcms_c_enable_probe_resp(struct brcms_c_info *wlc, bool enable)
+{
+       /*
+        * prevent ucode from sending probe responses by setting the timeout
+        * to 1, it can not send it in that time frame.
+        */
+       wlc->prb_resp_timeout = enable ? BRCMS_PRB_RESP_TIMEOUT : 1;
+       brcms_b_write_shm(wlc->hw, M_PRS_MAXTIME, wlc->prb_resp_timeout);
+       /* TODO: if (enable) => also deactivate receiving of probe request */
+}
+
 /* Write ssid into shared memory */
 static void
 brcms_c_shm_ssid_upd(struct brcms_c_info *wlc, struct brcms_bss_cfg *cfg)