From: Johan Almbladh <ja@anyfi.net>
To: johannes@sipsolutions.net
Cc: ordex@autistici.org, linux-wireless@vger.kernel.org,
Johan Almbladh <ja@anyfi.net>
Subject: [PATCHv2 1/2] mac80211: perform power save processing before decryption
Date: Wed, 14 Aug 2013 15:29:46 +0200 [thread overview]
Message-ID: <1376486987-23224-1-git-send-email-ja@anyfi.net> (raw)
In-Reply-To: <1376323275.11514.26.camel@jlt4.sipsolutions.net>
This patch decouples the power save processing from the frame decryption
by running the decrypt rx handler after sta_process. In the case where
the decryption failed for some reason, the stack used to not process
the PM and MOREDATA bits for that frame. The stack now always performs
power save processing regardless of the decryption result. That means that
encrypted data frames and NULLFUNC frames are now handled in the same way
regarding power save processing, making the stack more robust.
Tested-by: Johan Almbladh <ja@anyfi.net>
Signed-off-by: Johan Almbladh <ja@anyfi.net>
---
net/mac80211/rx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 6b85f95..0f0017d 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2939,10 +2939,10 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx,
*/
rx->skb = skb;
- CALL_RXH(ieee80211_rx_h_decrypt)
CALL_RXH(ieee80211_rx_h_check_more_data)
CALL_RXH(ieee80211_rx_h_uapsd_and_pspoll)
CALL_RXH(ieee80211_rx_h_sta_process)
+ CALL_RXH(ieee80211_rx_h_decrypt)
CALL_RXH(ieee80211_rx_h_defragment)
CALL_RXH(ieee80211_rx_h_michael_mic_verify)
/* must be after MMIC verify so header is counted in MPDU mic */
--
1.7.9.5
next prev parent reply other threads:[~2013-08-14 13:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 13:21 [RFC] mac80211: add support for split-MAC implementations Johan Almbladh
2013-08-09 13:07 ` Johannes Berg
2013-08-10 11:31 ` Johan Almbladh
2013-08-11 20:19 ` Johan Almbladh
2013-08-12 16:01 ` Johannes Berg
2013-08-12 18:04 ` Antonio Quartulli
2013-08-14 13:29 ` Johan Almbladh [this message]
2013-08-14 13:29 ` [PATCHv2 2/2] mac80211: non-functional change of rx handler location Johan Almbladh
2013-08-16 10:19 ` Johannes Berg
2013-08-15 6:08 ` [PATCHv2 1/2] mac80211: perform power save processing before decryption Kalle Valo
2013-08-15 6:58 ` Johan Almbladh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376486987-23224-1-git-send-email-ja@anyfi.net \
--to=ja@anyfi.net \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=ordex@autistici.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.