[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>

2 files changed, 7 insertions, 13 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 5e7c7e944c9d..64f6d1f25753 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7456,8 +7456,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv,
         /* HW decrypt will not clear the WEP bit, MIC, PN, etc. */
         hdr = (struct ieee80211_hdr_4addr *)rxb->skb->data;
         if (priv->ieee->iw_mode != IW_MODE_MONITOR &&
-            ((is_multicast_ether_addr(hdr->addr1) ||
-              is_broadcast_ether_addr(hdr->addr1)) ?
+            (is_multicast_ether_addr(hdr->addr1) ?
              !priv->ieee->host_mc_decrypt : !priv->ieee->host_decrypt))
                 ipw_rebuild_decrypted_skb(priv, rxb->skb);
 
@@ -7648,8 +7647,7 @@ static inline int is_network_packet(struct ipw_priv *priv,
                         return 0;
 
                 /* {broad,multi}cast packets to our BSSID go through */
-                if (is_multicast_ether_addr(header->addr1) ||
-                    is_broadcast_ether_addr(header->addr1))
+                if (is_multicast_ether_addr(header->addr1))
                         return !memcmp(header->addr3, priv->bssid, ETH_ALEN);
 
                 /* packets to our adapter go through */
@@ -7662,8 +7660,7 @@ static inline int is_network_packet(struct ipw_priv *priv,
                         return 0;
 
                 /* {broad,multi}cast packets to our BSS go through */
-                if (is_multicast_ether_addr(header->addr1) ||
-                    is_broadcast_ether_addr(header->addr1))
+                if (is_multicast_ether_addr(header->addr1))
                         return !memcmp(header->addr2, priv->bssid, ETH_ALEN);
 
                 /* packets to our adapter go through */
@@ -9657,8 +9654,7 @@ static inline int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
         switch (priv->ieee->iw_mode) {
         case IW_MODE_ADHOC:
                 hdr_len = IEEE80211_3ADDR_LEN;
-                unicast = !(is_multicast_ether_addr(hdr->addr1) ||
-                            is_broadcast_ether_addr(hdr->addr1));
+                unicast = !is_multicast_ether_addr(hdr->addr1);
                 id = ipw_find_station(priv, hdr->addr1);
                 if (id == IPW_INVALID_STATION) {
                         id = ipw_add_station(priv, hdr->addr1);
@@ -9673,8 +9669,7 @@ static inline int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
 
         case IW_MODE_INFRA:
         default:
-                unicast = !(is_multicast_ether_addr(hdr->addr3) ||
-                            is_broadcast_ether_addr(hdr->addr3));
+                unicast = !is_multicast_ether_addr(hdr->addr3);
                 hdr_len = IEEE80211_3ADDR_LEN;
                 id = 0;
                 break;
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 03efaacbdb73..4cc6f41c6930 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;