Drivers rtl8188ee, rtl8192ce, rtl8192se, and rtl8723ae all use this routine.
In addition, all callers of ieee80211_is_robust_mgmt_frame() have access to the
skb. Thus, it is trivial to use the new API rather than the underscored old version.
Signed-off-by: Larry Finger <[email protected]>
Cc: Johannes Berg <[email protected]>
---
Johannes,
I think this patch removes all callers of the old API.
Larry
---
drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
index 27ace30..384245f 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(skb)) &&
(ieee80211_has_protected(hdr->frame_control)))
rx_status->flag &= ~RX_FLAG_DECRYPTED;
else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 114858d..0d05bac 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -393,7 +393,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
/* In testing, hdr was NULL here */
return false;
}
- if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
+ if ((ieee80211_is_robust_mgmt_frame(skb)) &&
(ieee80211_has_protected(hdr->frame_control)))
rx_status->flag &= ~RX_FLAG_DECRYPTED;
else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 163a681..af1bb3d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
/* during testing, hdr was NULL here */
return false;
}
- if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
+ if ((ieee80211_is_robust_mgmt_frame(skb)) &&
(ieee80211_has_protected(hdr->frame_control)))
rx_status->flag &= ~RX_FLAG_DECRYPTED;
else
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index 721162c..8f20226 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@ -334,8 +334,8 @@ bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
/* during testing, hdr could be NULL here */
return false;
}
- if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
- (ieee80211_has_protected(hdr->frame_control)))
+ if ((ieee80211_is_robust_mgmt_frame(skb)) &&
+ (ieee80211_has_protected(hdr->frame_control)))
rx_status->flag &= ~RX_FLAG_DECRYPTED;
else
rx_status->flag |= RX_FLAG_DECRYPTED;
--
1.8.4.5
On Fri, 2014-02-21 at 08:33 -0600, Larry Finger wrote:
> Drivers rtl8188ee, rtl8192ce, rtl8192se, and rtl8723ae all use this routine.
> In addition, all callers of ieee80211_is_robust_mgmt_frame() have access to the
> skb. Thus, it is trivial to use the new API rather than the underscored old version.
Unfortunately, I'm pretty sure this is incorrect. I looked at this code
before, and take for example:
> +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
> @@ -334,8 +334,8 @@ bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
> /* during testing, hdr could be NULL here */
> return false;
> }
> - if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
> - (ieee80211_has_protected(hdr->frame_control)))
> + if ((ieee80211_is_robust_mgmt_frame(skb)) &&
> + (ieee80211_has_protected(hdr->frame_control)))
Here, hdr is set like this:
hdr = (struct ieee80211_hdr *)(skb->data +
status->rx_drvinfo_size + status->rx_bufshift);
so the skb clearly contains something else before the hdr, and the
conversion is probably not right because it assumes hdr == skb->data,
where here it isn't that but instead (skb->data + something).
johannes
On 02/21/2014 08:38 AM, Johannes Berg wrote:
> On Fri, 2014-02-21 at 08:33 -0600, Larry Finger wrote:
>> Drivers rtl8188ee, rtl8192ce, rtl8192se, and rtl8723ae all use this routine.
>> In addition, all callers of ieee80211_is_robust_mgmt_frame() have access to the
>> skb. Thus, it is trivial to use the new API rather than the underscored old version.
>
> Unfortunately, I'm pretty sure this is incorrect. I looked at this code
> before, and take for example:
>
>> +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
>> @@ -334,8 +334,8 @@ bool rtl8723ae_rx_query_desc(struct ieee80211_hw *hw,
>> /* during testing, hdr could be NULL here */
>> return false;
>> }
>> - if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
>> - (ieee80211_has_protected(hdr->frame_control)))
>> + if ((ieee80211_is_robust_mgmt_frame(skb)) &&
>> + (ieee80211_has_protected(hdr->frame_control)))
>
> Here, hdr is set like this:
>
> hdr = (struct ieee80211_hdr *)(skb->data +
> status->rx_drvinfo_size + status->rx_bufshift);
>
> so the skb clearly contains something else before the hdr, and the
> conversion is probably not right because it assumes hdr == skb->data,
> where here it isn't that but instead (skb->data + something).
I thought I had tested the change, but I'm not sure if my AP is using
ieee802.11w. I need to test this better.
@John: Please drop this patch.
Larry