|
@@ -174,12 +174,6 @@ static struct ieee80211_channel hdd_channels_2_4_ghz[] = {
|
|
|
HDD2GHZCHAN(2484, 14, 0),
|
|
|
};
|
|
|
|
|
|
-static struct ieee80211_channel hdd_social_channels_2_4_ghz[] = {
|
|
|
- HDD2GHZCHAN(2412, 1, 0),
|
|
|
- HDD2GHZCHAN(2437, 6, 0),
|
|
|
- HDD2GHZCHAN(2462, 11, 0),
|
|
|
-};
|
|
|
-
|
|
|
static struct ieee80211_channel hdd_channels_5_ghz[] = {
|
|
|
HDD5GHZCHAN(5180, 36, 0),
|
|
|
HDD5GHZCHAN(5200, 40, 0),
|
|
@@ -268,23 +262,6 @@ static struct ieee80211_supported_band wlan_hdd_band_2_4_ghz = {
|
|
|
.ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED,
|
|
|
};
|
|
|
|
|
|
-static struct ieee80211_supported_band wlan_hdd_band_p2p_2_4_ghz = {
|
|
|
- .channels = hdd_social_channels_2_4_ghz,
|
|
|
- .n_channels = ARRAY_SIZE(hdd_social_channels_2_4_ghz),
|
|
|
- .band = IEEE80211_BAND_2GHZ,
|
|
|
- .bitrates = g_mode_rates,
|
|
|
- .n_bitrates = g_mode_rates_size,
|
|
|
- .ht_cap.ht_supported = 1,
|
|
|
- .ht_cap.cap = IEEE80211_HT_CAP_SGI_20
|
|
|
- | IEEE80211_HT_CAP_GRN_FLD
|
|
|
- | IEEE80211_HT_CAP_DSSSCCK40 | IEEE80211_HT_CAP_LSIG_TXOP_PROT,
|
|
|
- .ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
|
|
|
- .ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
|
|
|
- .ht_cap.mcs.rx_mask = {0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0,},
|
|
|
- .ht_cap.mcs.rx_highest = cpu_to_le16(72),
|
|
|
- .ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED,
|
|
|
-};
|
|
|
-
|
|
|
static struct ieee80211_supported_band wlan_hdd_band_5_ghz = {
|
|
|
.channels = hdd_channels_5_ghz,
|
|
|
.n_channels = ARRAY_SIZE(hdd_channels_5_ghz),
|
|
@@ -5954,8 +5931,6 @@ int wlan_hdd_cfg80211_init(struct device *dev,
|
|
|
if (!pCfg->ShortGI20MhzEnable) {
|
|
|
wlan_hdd_band_2_4_ghz.ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_20;
|
|
|
wlan_hdd_band_5_ghz.ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_20;
|
|
|
- wlan_hdd_band_p2p_2_4_ghz.ht_cap.cap &=
|
|
|
- ~IEEE80211_HT_CAP_SGI_20;
|
|
|
}
|
|
|
|
|
|
if (!pCfg->ShortGI40MhzEnable) {
|