diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-10-12 17:28:21 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:16 -0400 |
| commit | 55182e4adfffa808a1d07a515637c05c67028a5f (patch) | |
| tree | b07870ed475792815cafafabb3dce51f192143aa /net/mac80211 | |
| parent | 107ef97a170dec95893f34614edd92eb8cb9b5d0 (diff) | |
| download | op-kernel-dev-55182e4adfffa808a1d07a515637c05c67028a5f.zip op-kernel-dev-55182e4adfffa808a1d07a515637c05c67028a5f.tar.gz | |
mac80211: reformat TX unauthorised check
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 97ac2c4..48bbb96 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1896,11 +1896,10 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, * 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" |
