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

[kvmfornfv.git] / kernel / drivers / net / wireless / ath / carl9170 / fw.c

diff --git a/kernel/drivers/net/wireless/ath/carl9170/fw.c b/kernel/drivers/net/wireless/ath/carl9170/fw.c
index 47d5c2e..88045f9 100644 (file)
--- a/kernel/drivers/net/wireless/ath/carl9170/fw.c
+++ b/kernel/drivers/net/wireless/ath/carl9170/fw.c
@@ -286,7 +286,7 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
        }
 
        if (SUPP(CARL9170FW_PSM) && SUPP(CARL9170FW_FIXED_5GHZ_PSM))
-               ar->hw->flags |= IEEE80211_HW_SUPPORTS_PS;
+               ieee80211_hw_set(ar->hw, SUPPORTS_PS);
 
        if (!SUPP(CARL9170FW_USB_INIT_FIRMWARE)) {
                dev_err(&ar->udev->dev, "firmware does not provide "
@@ -310,8 +310,7 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
        if (SUPP(CARL9170FW_RX_FILTER)) {
                ar->fw.rx_filter = true;
                ar->rx_filter_caps = FIF_FCSFAIL | FIF_PLCPFAIL |
-                       FIF_CONTROL | FIF_PSPOLL | FIF_OTHER_BSS |
-                       FIF_PROMISC_IN_BSS;
+                       FIF_CONTROL | FIF_PSPOLL | FIF_OTHER_BSS;
        }
 
        if (SUPP(CARL9170FW_HW_COUNTERS))