Commit 2c61cf9c authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent c84387d2

net/mac80211/rx.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -722,7 +722,7 @@ static int ieee80211_get_mmie_keyidx(struct sk_buff *skb) 
	return -1;

	return -1;

}

}





static int iwl80211_get_cs_keyid(const struct ieee80211_cipher_scheme *cs,

static int ieee80211_get_cs_keyid(const struct ieee80211_cipher_scheme *cs,

				  struct sk_buff *skb)

				  struct sk_buff *skb)

{

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
@@ -1586,7 +1586,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 




		if (ieee80211_has_protected(fc) && rx->sta->cipher_scheme) {

		if (ieee80211_has_protected(fc) && rx->sta->cipher_scheme) {

			cs = 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))

			if (unlikely(keyid < 0))

				return RX_DROP_UNUSABLE;

				return RX_DROP_UNUSABLE;

		}

		}
@@ -1670,7 +1670,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) 
		hdrlen = ieee80211_hdrlen(fc);

		hdrlen = ieee80211_hdrlen(fc);





		if (cs) {

		if (cs) {

			keyidx = iwl80211_get_cs_keyid(cs, rx->skb);

			keyidx = ieee80211_get_cs_keyid(cs, rx->skb);





			if (unlikely(keyidx < 0))

			if (unlikely(keyidx < 0))

				return RX_DROP_UNUSABLE;

				return RX_DROP_UNUSABLE;