diff mbox

[Trusty,SRU] rtl8821ae: fixup staging driver for revised ieee80211_is_robust_mgmt_frame

Message ID 53E8FADC.3090102@canonical.com
State New
Headers show

Commit Message

Tim Gardner Aug. 11, 2014, 5:18 p.m. UTC

Comments

Seth Forshee Aug. 11, 2014, 6:16 p.m. UTC | #1
Tim Gardner Aug. 11, 2014, 6:27 p.m. UTC | #2
diff mbox

Patch

From 1975321cd9213c6e3e0ee84bc3ca3d90b9446f1e Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 13 Mar 2014 12:53:52 -0400
Subject: [PATCH Trusty SRU] rtl8821ae: fixup staging driver for revised ieee80211_is_robust_mgmt_frame

BugLink: http://bugs.launchpad.net/bugs/1354469

Commit d8ca16db6bb2 ("mac80211: add length check in
ieee80211_is_robust_mgmt_frame()") changed that API to take an skb,
and added "_ieee80211_is_robust_mgmt_frame" as a direct replacement
for the older API.  This is the same fix that was applied to the other
rtlwifi drivers in that commit.

Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
(cherry picked from commit a699248613f7c32292fac23a60a75bcee14fb4a8)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/staging/rtl8821ae/rtl8821ae/trx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8821ae/rtl8821ae/trx.c b/drivers/staging/rtl8821ae/rtl8821ae/trx.c
index 75ae438..963b55f 100644
--- a/drivers/staging/rtl8821ae/rtl8821ae/trx.c
+++ b/drivers/staging/rtl8821ae/rtl8821ae/trx.c
@@ -616,7 +616,7 @@  bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,
 				return false;
 		}
 
-		if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
+		if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
 			(ieee80211_has_protected(hdr->frame_control)))
 			rx_status->flag &= ~RX_FLAG_DECRYPTED;
 		else
-- 
1.9.1