These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / ath / wcn36xx / main.c

diff --git a/kernel/drivers/net/wireless/ath/wcn36xx/main.c b/kernel/drivers/net/wireless/ath/wcn36xx/main.c
index 0783d2e..7c169ab 100644 (file)
--- a/kernel/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/kernel/drivers/net/wireless/ath/wcn36xx/main.c
@@ -859,7 +859,7 @@ static int wcn36xx_ampdu_action(struct ieee80211_hw *hw,
                    struct ieee80211_vif *vif,
                    enum ieee80211_ampdu_mlme_action action,
                    struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                   u8 buf_size)
+                   u8 buf_size, bool amsdu)
 {
        struct wcn36xx *wcn = hw->priv;
        struct wcn36xx_sta *sta_priv = NULL;
@@ -944,12 +944,12 @@ static int wcn36xx_init_ieee80211(struct wcn36xx *wcn)
                WLAN_CIPHER_SUITE_CCMP,
        };
 
-       wcn->hw->flags = IEEE80211_HW_SIGNAL_DBM |
-               IEEE80211_HW_HAS_RATE_CONTROL |
-               IEEE80211_HW_SUPPORTS_PS |
-               IEEE80211_HW_CONNECTION_MONITOR |
-               IEEE80211_HW_AMPDU_AGGREGATION |
-               IEEE80211_HW_TIMING_BEACON_ONLY;
+       ieee80211_hw_set(wcn->hw, TIMING_BEACON_ONLY);
+       ieee80211_hw_set(wcn->hw, AMPDU_AGGREGATION);
+       ieee80211_hw_set(wcn->hw, CONNECTION_MONITOR);
+       ieee80211_hw_set(wcn->hw, SUPPORTS_PS);
+       ieee80211_hw_set(wcn->hw, SIGNAL_DBM);
+       ieee80211_hw_set(wcn->hw, HAS_RATE_CONTROL);
 
        wcn->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
                BIT(NL80211_IFTYPE_AP) |