diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-01-03 15:27:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-03 15:27:38 -0800 |
| commit | 3c19065a1e2c862becc576bc65e54f2bc1cbffe6 (patch) | |
| tree | ffea801487e7bb870fad3ef3dbd4605193acd5d4 /net | |
| parent | 88df8ef59a3eb54b1e2412765ff2736d2376d1ca (diff) | |
| download | linux-3.10-3c19065a1e2c862becc576bc65e54f2bc1cbffe6.tar.gz linux-3.10-3c19065a1e2c862becc576bc65e54f2bc1cbffe6.tar.bz2 linux-3.10-3c19065a1e2c862becc576bc65e54f2bc1cbffe6.zip | |
[IEEE80211] ipw2200: Simplify multicast checks.
From: Stephen Hemminger <shemminger@osdl.org>
is_multicast_ether_addr() accepts broadcast too, so the
is_broadcast_ether_addr() calls are redundant.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 03efaacbdb7..4cc6f41c693 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -410,9 +410,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, return 1; } - if ((is_multicast_ether_addr(hdr->addr1) || - is_broadcast_ether_addr(hdr->addr2)) ? ieee->host_mc_decrypt : - ieee->host_decrypt) { + if (is_multicast_ether_addr(hdr->addr1) + ? ieee->host_mc_decrypt : ieee->host_decrypt) { int idx = 0; if (skb->len >= hdrlen + 3) idx = skb->data[hdrlen + 3] >> 6; |