Merge tag 'clk-for-linus-3.18' of git://git.linaro.org/people/mike.turquette/linux

[firefly-linux-kernel-4.4.55.git] / net / wireless / mlme.c

diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 369fc334fdadede142c86f9676dd752761d4f4c4..2c52b59e43f319670e6ce054b0eda1bde995ce1c 100644 (file)
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -19,7 +19,7 @@
 
 
 void cfg80211_rx_assoc_resp(struct net_device *dev, struct cfg80211_bss *bss,
-                           const u8 *buf, size_t len)
+                           const u8 *buf, size_t len, int uapsd_queues)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct wiphy *wiphy = wdev->wiphy;
@@ -43,7 +43,7 @@ void cfg80211_rx_assoc_resp(struct net_device *dev, struct cfg80211_bss *bss,
                return;
        }
 
-       nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL);
+       nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL, uapsd_queues);
        /* update current_bss etc., consumes the bss reference */
        __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, ie, len - ieoffs,
                                  status_code,