mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
1909a42ad4
There are two important patches in this patchset: updating read pointer quicker & rework of .get_station(). There are few more upstream patches that are p2p-related and weren't backported in this commit. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 46084
199 lines
5.7 KiB
Diff
199 lines
5.7 KiB
Diff
From: Pontus Fuchs <pontusf@broadcom.com>
|
|
Date: Thu, 11 Jun 2015 00:12:18 +0200
|
|
Subject: [PATCH] brcmfmac: Build wiphy mode and interface combinations
|
|
dynamically
|
|
|
|
Switch from using semi hard coded interface combinations. This makes
|
|
it easier to announce what the firmware actually supports. This fixes
|
|
the case where brcmfmac announces p2p but the firmware doesn't
|
|
support it.
|
|
|
|
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
|
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
|
|
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Pontus Fuchs <pontusf@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
|
|
@@ -52,8 +52,6 @@
|
|
#define BRCMF_PNO_SCAN_COMPLETE 1
|
|
#define BRCMF_PNO_SCAN_INCOMPLETE 0
|
|
|
|
-#define BRCMF_IFACE_MAX_CNT 3
|
|
-
|
|
#define WPA_OUI "\x00\x50\xF2" /* WPA OUI */
|
|
#define WPA_OUI_TYPE 1
|
|
#define RSN_OUI "\x00\x0F\xAC" /* RSN OUI */
|
|
@@ -5639,53 +5637,6 @@ static int brcmf_setup_wiphybands(struct
|
|
return 0;
|
|
}
|
|
|
|
-static const struct ieee80211_iface_limit brcmf_iface_limits_mbss[] = {
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_STATION) |
|
|
- BIT(NL80211_IFTYPE_ADHOC)
|
|
- },
|
|
- {
|
|
- .max = 4,
|
|
- .types = BIT(NL80211_IFTYPE_AP)
|
|
- },
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
- BIT(NL80211_IFTYPE_P2P_GO)
|
|
- },
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_P2P_DEVICE)
|
|
- }
|
|
-};
|
|
-
|
|
-static const struct ieee80211_iface_limit brcmf_iface_limits_sbss[] = {
|
|
- {
|
|
- .max = 2,
|
|
- .types = BIT(NL80211_IFTYPE_STATION) |
|
|
- BIT(NL80211_IFTYPE_ADHOC) |
|
|
- BIT(NL80211_IFTYPE_AP)
|
|
- },
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
- BIT(NL80211_IFTYPE_P2P_GO)
|
|
- },
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_P2P_DEVICE)
|
|
- }
|
|
-};
|
|
-static struct ieee80211_iface_combination brcmf_iface_combos[] = {
|
|
- {
|
|
- .max_interfaces = BRCMF_IFACE_MAX_CNT,
|
|
- .num_different_channels = 1,
|
|
- .n_limits = ARRAY_SIZE(brcmf_iface_limits_sbss),
|
|
- .limits = brcmf_iface_limits_sbss,
|
|
- }
|
|
-};
|
|
-
|
|
static const struct ieee80211_txrx_stypes
|
|
brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {
|
|
[NL80211_IFTYPE_STATION] = {
|
|
@@ -5715,6 +5666,67 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] =
|
|
}
|
|
};
|
|
|
|
+static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
|
|
+{
|
|
+ struct ieee80211_iface_combination *combo = NULL;
|
|
+ struct ieee80211_iface_limit *limits = NULL;
|
|
+ int i = 0, max_iface_cnt;
|
|
+
|
|
+ combo = kzalloc(sizeof(*combo), GFP_KERNEL);
|
|
+ if (!combo)
|
|
+ goto err;
|
|
+
|
|
+ limits = kzalloc(sizeof(*limits) * 4, GFP_KERNEL);
|
|
+ if (!limits)
|
|
+ goto err;
|
|
+
|
|
+ wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
|
+ BIT(NL80211_IFTYPE_ADHOC) |
|
|
+ BIT(NL80211_IFTYPE_AP);
|
|
+
|
|
+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN))
|
|
+ combo->num_different_channels = 2;
|
|
+ else
|
|
+ combo->num_different_channels = 1;
|
|
+
|
|
+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) {
|
|
+ limits[i].max = 1;
|
|
+ limits[i++].types = BIT(NL80211_IFTYPE_STATION);
|
|
+ limits[i].max = 4;
|
|
+ limits[i++].types = BIT(NL80211_IFTYPE_AP);
|
|
+ max_iface_cnt = 5;
|
|
+ } else {
|
|
+ limits[i].max = 2;
|
|
+ limits[i++].types = BIT(NL80211_IFTYPE_STATION) |
|
|
+ BIT(NL80211_IFTYPE_AP);
|
|
+ max_iface_cnt = 2;
|
|
+ }
|
|
+
|
|
+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P)) {
|
|
+ wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
+ BIT(NL80211_IFTYPE_P2P_GO) |
|
|
+ BIT(NL80211_IFTYPE_P2P_DEVICE);
|
|
+ limits[i].max = 1;
|
|
+ limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
+ BIT(NL80211_IFTYPE_P2P_GO);
|
|
+ limits[i].max = 1;
|
|
+ limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
|
|
+ max_iface_cnt += 2;
|
|
+ }
|
|
+ combo->max_interfaces = max_iface_cnt;
|
|
+ combo->limits = limits;
|
|
+ combo->n_limits = i;
|
|
+
|
|
+ wiphy->iface_combinations = combo;
|
|
+ wiphy->n_iface_combinations = 1;
|
|
+ return 0;
|
|
+
|
|
+err:
|
|
+ kfree(limits);
|
|
+ kfree(combo);
|
|
+ return -ENOMEM;
|
|
+}
|
|
+
|
|
static void brcmf_wiphy_pno_params(struct wiphy *wiphy)
|
|
{
|
|
/* scheduled scan settings */
|
|
@@ -5745,7 +5757,6 @@ static void brcmf_wiphy_wowl_params(stru
|
|
static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
|
|
{
|
|
struct ieee80211_supported_band *band;
|
|
- struct ieee80211_iface_combination ifc_combo;
|
|
__le32 bandlist[3];
|
|
u32 n_bands;
|
|
int err, i;
|
|
@@ -5753,24 +5764,11 @@ static int brcmf_setup_wiphy(struct wiph
|
|
wiphy->max_scan_ssids = WL_NUM_SCAN_MAX;
|
|
wiphy->max_scan_ie_len = BRCMF_SCAN_IE_LEN_MAX;
|
|
wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
|
|
- wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
|
- BIT(NL80211_IFTYPE_ADHOC) |
|
|
- BIT(NL80211_IFTYPE_AP) |
|
|
- BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
- BIT(NL80211_IFTYPE_P2P_GO) |
|
|
- BIT(NL80211_IFTYPE_P2P_DEVICE);
|
|
- /* need VSDB firmware feature for concurrent channels */
|
|
- ifc_combo = brcmf_iface_combos[0];
|
|
- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN))
|
|
- ifc_combo.num_different_channels = 2;
|
|
- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) {
|
|
- ifc_combo.n_limits = ARRAY_SIZE(brcmf_iface_limits_mbss),
|
|
- ifc_combo.limits = brcmf_iface_limits_mbss;
|
|
- }
|
|
- wiphy->iface_combinations = kmemdup(&ifc_combo,
|
|
- sizeof(ifc_combo),
|
|
- GFP_KERNEL);
|
|
- wiphy->n_iface_combinations = ARRAY_SIZE(brcmf_iface_combos);
|
|
+
|
|
+ err = brcmf_setup_ifmodes(wiphy, ifp);
|
|
+ if (err)
|
|
+ return err;
|
|
+
|
|
wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
|
|
wiphy->cipher_suites = __wl_cipher_suites;
|
|
wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
|
|
@@ -6035,6 +6033,8 @@ static void brcmf_free_wiphy(struct wiph
|
|
if (!wiphy)
|
|
return;
|
|
|
|
+ if (wiphy->iface_combinations)
|
|
+ kfree(wiphy->iface_combinations->limits);
|
|
kfree(wiphy->iface_combinations);
|
|
if (wiphy->bands[IEEE80211_BAND_2GHZ]) {
|
|
kfree(wiphy->bands[IEEE80211_BAND_2GHZ]->channels);
|