diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2015-10-26 22:10:10 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2015-10-27 00:38:43 +0100 |
| commit | ed38b2a06a6aee1f09c8a9fe2d60c31fbf8ed95f (patch) | |
| tree | fcb885e5a6878d9d6a1e578a73b1cd1e126ce1ea | |
| parent | 06e194713df04c822131fb383a8d162951194e15 (diff) | |
mwlwifi: make 10.3.0.3 version 100-api_update.patch compatible
Signed-off-by: Bjørn Mork <bjorn@mork.no>
| -rw-r--r-- | main.c | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -469,7 +469,11 @@ static void mwl_set_ht_caps(struct mwl_priv *priv, band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20; band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; +#else + ieee80211_hw_set(hw, AMPDU_AGGREGATION); +#endif band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_4; @@ -571,12 +575,21 @@ static int mwl_wl_init(struct mwl_priv *priv) hw->queues = SYSADPT_TX_WMM_QUEUES; /* Set rssi values to dBm */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL; +#else + ieee80211_hw_set(hw, SIGNAL_DBM); + ieee80211_hw_set(hw, HAS_RATE_CONTROL); +#endif /* Ask mac80211 to not to trigger PS mode * based on PM bit of incoming frames. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) hw->flags |= IEEE80211_HW_AP_LINK_PS; +#else + ieee80211_hw_set(hw, AP_LINK_PS); +#endif hw->vif_data_size = sizeof(struct mwl_vif); hw->sta_data_size = sizeof(struct mwl_sta); |