>From 43070f098527c6f9022a83eb41e95b166e6d8605 Mon Sep 17 00:00:00 2001 From: Harvey Harrison <harvey.harrison@xxxxxxxxx> Date: Mon, 23 Jun 2008 14:21:13 -0700 Subject: [PATCH] mac80211: fix incorrect bit masking from previous patch Checked ieee802.11-2007 and saw I changed this to mask one too many bits, the original comment is correct. Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> --- net/mac80211/wpa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index fba5fda..5d0d6db 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -322,7 +322,7 @@ static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad, * Retry, PwrMgt, MoreData; set Protected */ msk_fc = hdr->frame_control; - msk_fc &= ~cpu_to_le16(IEEE80211_FCTL_STYPE | IEEE80211_FCTL_RETRY | + msk_fc &= ~cpu_to_le16(0x0070 | IEEE80211_FCTL_RETRY | IEEE80211_FCTL_PM | IEEE80211_FCTL_MOREDATA); msk_fc |= cpu_to_le16(IEEE80211_FCTL_PROTECTED); put_unaligned(msk_fc, (__le16 *)(aad + 2)); -- 1.5.6.290.gc4e15 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
