From ed38b2a06a6aee1f09c8a9fe2d60c31fbf8ed95f Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Mon, 26 Oct 2015 22:10:10 +0100 Subject: mwlwifi: make 10.3.0.3 version 100-api_update.patch compatible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjørn Mork --- main.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/main.c b/main.c index e01ea75..b681f6e 100644 --- a/main.c +++ b/main.c @@ -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); -- cgit v1.2.3