diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2016-03-17 14:02:55 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-04-05 12:12:41 +0200 |
| commit | 2c61cf9c56cbc4e0a4475232659ac30bb4c28674 (patch) | |
| tree | c485f614db429560d151351ffab451ce271c4cb9 /net | |
| parent | mac80211: clean up station flags debugfs (diff) | |
| download | linux-2c61cf9c56cbc4e0a4475232659ac30bb4c28674.tar.xz linux-2c61cf9c56cbc4e0a4475232659ac30bb4c28674.zip | |
mac80211: fix cipher scheme function name
The code is only used with iwlwifi, but still should have proper
mac80211 naming scheme; fix that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 36214e332225..009bb90d7f5a 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; |