74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
|
|
@@ -359,11 +359,12 @@ brcms_ops_add_interface(struct ieee80211
|
|
{
|
|
struct brcms_info *wl = hw->priv;
|
|
|
|
- /* Just STA and AP for now */
|
|
+ /* Just STA, AP and ADHOC for now */
|
|
if (vif->type != NL80211_IFTYPE_STATION &&
|
|
- vif->type != NL80211_IFTYPE_AP) {
|
|
+ vif->type != NL80211_IFTYPE_AP &&
|
|
+ vif->type != NL80211_IFTYPE_ADHOC) {
|
|
brcms_err(wl->wlc->hw->d11core,
|
|
- "%s: Attempt to add type %d, only STA and AP for now\n",
|
|
+ "%s: Attempt to add type %d, only STA, AP and AdHoc for now\n",
|
|
__func__, vif->type);
|
|
return -EOPNOTSUPP;
|
|
}
|
|
@@ -376,6 +377,8 @@ brcms_ops_add_interface(struct ieee80211
|
|
else if (vif->type == NL80211_IFTYPE_AP)
|
|
brcms_c_start_ap(wl->wlc, vif->addr, vif->bss_conf.bssid,
|
|
vif->bss_conf.ssid, vif->bss_conf.ssid_len);
|
|
+ else if (vif->type == NL80211_IFTYPE_ADHOC)
|
|
+ brcms_c_start_adhoc(wl->wlc, vif->addr);
|
|
spin_unlock_bh(&wl->lock);
|
|
|
|
return 0;
|
|
@@ -1057,7 +1060,8 @@ static int ieee_hw_init(struct ieee80211
|
|
/* channel change time is dependent on chip and band */
|
|
hw->channel_change_time = 7 * 1000;
|
|
hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
|
- BIT(NL80211_IFTYPE_AP);
|
|
+ BIT(NL80211_IFTYPE_AP) |
|
|
+ BIT(NL80211_IFTYPE_ADHOC);
|
|
|
|
/*
|
|
* deactivate sending probe responses by ucude, because this will
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
|
|
@@ -2188,6 +2188,14 @@ void brcms_c_start_ap(struct brcms_c_inf
|
|
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)
|
|
{
|
|
@@ -3079,6 +3087,9 @@ static bool brcms_c_ps_allowed(struct br
|
|
if (wlc->bsscfg->type == BRCMS_TYPE_AP)
|
|
return false;
|
|
|
|
+ if (wlc->bsscfg->type == BRCMS_TYPE_ADHOC)
|
|
+ return false;
|
|
+
|
|
return true;
|
|
}
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/pub.h
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/pub.h
|
|
@@ -334,6 +334,7 @@ extern bool brcms_c_tx_flush_completed(s
|
|
extern void brcms_c_start_station(struct brcms_c_info *wlc, u8 *addr);
|
|
extern void brcms_c_start_ap(struct brcms_c_info *wlc, u8 *addr,
|
|
const u8 *bssid, u8 *ssid, size_t ssid_len);
|
|
+extern void brcms_c_start_adhoc(struct brcms_c_info *wlc, u8 *addr);
|
|
extern void brcms_c_update_beacon(struct brcms_c_info *wlc);
|
|
extern void brcms_c_set_new_beacon(struct brcms_c_info *wlc,
|
|
struct sk_buff *beacon, u16 tim_offset,
|