Re: [PATCH 4/4] mac80211: fix cipher scheme function name

[Johannes Berg]

On Thu, 2016-03-17 at 15:02 +0200, Emmanuel Grumbach wrote:
> From: Johannes Berg 
> 
> The code is only used with iwlwifi, but still should have proper
> mac80211 naming scheme; fix that.
> 
All 4 applied.

johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 4/4] mac80211: fix cipher scheme function name

[Emmanuel Grumbach]

From: Johannes Berg 

The code is only used with iwlwifi, but still should have proper
mac80211 naming scheme; fix that.

Signed-off-by: Johannes Berg 
---
 net/mac80211/rx.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3746ba5..57a0ccd 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -722,8 +722,8 @@ static int ieee80211_get_mmie_keyidx(struct sk_buff *skb)
return -1;
 }
 
-static int iwl80211_get_cs_keyid(const struct ieee80211_cipher_scheme *cs,
-struct sk_buff *skb)
+static int ieee80211_get_cs_keyid(const struct ieee80211_cipher_scheme *cs,
+ struct sk_buff *skb)
 {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
__le16 fc;
@@ -1586,7 +1586,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
 
if (ieee80211_has_protected(fc) && rx->sta->cipher_scheme) {
cs = rx->sta->cipher_scheme;
-   keyid = iwl80211_get_cs_keyid(cs, rx->skb);
+   keyid = ieee80211_get_cs_keyid(cs, rx->skb);
if (unlikely(keyid < 0))
return RX_DROP_UNUSABLE;
}
@@ -1670,7 +1670,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
hdrlen = ieee80211_hdrlen(fc);
 
if (cs) {
-   keyidx = iwl80211_get_cs_keyid(cs, rx->skb);
+   keyidx = ieee80211_get_cs_keyid(cs, rx->skb);
 
if (unlikely(keyidx < 0))
return RX_DROP_UNUSABLE;
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html