diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:24:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:24:14 -0500 |
| commit | 841577c3d33b8a2bff66d1b506d8198b25900bde (patch) | |
| tree | 444ca28c7b9ed796d3949f019ae97d2c8ed5bd28 /drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | |
| parent | e9c653167710e5624c5576ee7d657c6b86878caf (diff) | |
| parent | 63c361f5114d81db789f8f5671c76c228c35b021 (diff) | |
| download | talos-obmc-linux-841577c3d33b8a2bff66d1b506d8198b25900bde.tar.gz talos-obmc-linux-841577c3d33b8a2bff66d1b506d8198b25900bde.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8188ee/trx.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c index aece6c9cccf1..27ace3054d56 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c @@ -452,7 +452,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, /* During testing, hdr was NULL */ 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 |
