From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Subject: [RFC 01/12] mac80211: reformat TX unauthorised check
Date: Fri, 14 Oct 2011 17:11:20 +0200 [thread overview]
Message-ID: <20111014151150.110056640@sipsolutions.net> (raw)
In-Reply-To: 20111014151119.246288840@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
Reformat the check, the indentation is completely strange.
Also change the last part of the condition to make the
code shorter.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/tx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
--- a/net/mac80211/tx.c 2011-10-12 17:11:32.000000000 +0200
+++ b/net/mac80211/tx.c 2011-10-12 17:27:00.000000000 +0200
@@ -1896,11 +1896,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s
* Drop unicast frames to unauthorised stations unless they are
* EAPOL frames from the local station.
*/
- if (!ieee80211_vif_is_mesh(&sdata->vif) &&
- unlikely(!is_multicast_ether_addr(hdr.addr1) && !authorized &&
- !(cpu_to_be16(ethertype) == sdata->control_port_protocol &&
- compare_ether_addr(sdata->vif.addr,
- skb->data + ETH_ALEN) == 0))) {
+ if (unlikely(!ieee80211_vif_is_mesh(&sdata->vif) &&
+ !is_multicast_ether_addr(hdr.addr1) && !authorized &&
+ (cpu_to_be16(ethertype) != sdata->control_port_protocol ||
+ compare_ether_addr(sdata->vif.addr, skb->data + ETH_ALEN)))) {
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
if (net_ratelimit())
printk(KERN_DEBUG "%s: dropped frame to %pM"
next prev parent reply other threads:[~2011-10-14 15:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 15:11 [RFC 00/12] no more mon.wlan0 Johannes Berg
2011-10-14 15:11 ` Johannes Berg [this message]
2011-10-14 15:11 ` [RFC 02/12] mac80211: fix TID for null poll response Johannes Berg
2011-10-14 15:11 ` [RFC 03/12] mac80211: add helper to free TX skb Johannes Berg
2011-10-14 15:11 ` [RFC 04/12] mac80211: add support for control port protocol in AP mode Johannes Berg
2011-10-14 15:11 ` [RFC 05/12] nl80211: allow subscribing to unexpected class3 frames Johannes Berg
2011-10-14 15:11 ` [RFC 06/12] mac80211: support spurious class3 event Johannes Berg
2011-10-14 15:11 ` [RFC 07/12] nl80211: advertise device AP SME Johannes Berg
2011-10-14 15:11 ` [RFC 08/12] nl80211: add API to probe a client Johannes Berg
2011-10-14 15:11 ` [RFC 09/12] mac80211: support client probe Johannes Berg
2011-10-14 15:11 ` [RFC 10/12] net: add wireless TX status socket option Johannes Berg
2011-10-14 15:11 ` [RFC 11/12] nl80211: advertise socket TX status capability Johannes Berg
2011-10-14 15:11 ` [RFC 12/12] mac80211: implement wifi TX status Johannes Berg
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=20111014151150.110056640@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).