commit 358c8d9d332230b14e130b78a6930996cdbf84c2
author Harvey Harrison <harvey.harrison@gmail.com> Tue Jul 15 18:44:13 2008 -0700
committer John W. Linville <linville@tuxdriver.com> Fri Aug 22 16:29:54 2008 -0400
tree 0a563e201e4c5fff9564579877ff0e5f0dd58294
parent e7827a7031a931c74c48e4a53f73ed862f0c8da0

mac80211: use ieee80211 frame control directly

Remove the last users of the rx/tx_data->fc data members and use the
le16 frame_control from the header directly.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/wep.c

diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
index 6399987..376c849 100644
--- a/net/mac80211/wep.c
+++ b/net/mac80211/wep.c
@@ -291,9 +291,10 @@
 ieee80211_rx_result
 ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx)
 {
-	if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA &&
-	    ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
-	     (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH))
+	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
+
+	if (!ieee80211_is_data(hdr->frame_control) &&
+	    !ieee80211_is_auth(hdr->frame_control))
 		return RX_CONTINUE;
 
 	if (!(rx->status->flag & RX_FLAG_DECRYPTED)) {