aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKris Katterjohn <kjak@users.sourceforge.net>2006-01-06 16:05:58 -0500
committerDavid S. Miller <davem@davemloft.net>2006-01-06 16:05:58 -0500
commitdbbc0988288d9643044e8bd8c7e7de70016ecd23 (patch)
tree6e3175bf90bb9702be4fe631b1db36f850cf4249
parentd99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff)
[NET]: Use newer is_multicast_ether_addr() in some files
This uses is_multicast_ether_addr() because it has recently been changed to do the same thing these seperate tests are doing. Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/atm/br2684.c2
-rw-r--r--net/bridge/br_input.c2
-rw-r--r--net/ethernet/eth.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 72f3f7b8de80..bdb4d89730d2 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev)
295 unsigned char *rawp; 295 unsigned char *rawp;
296 eth = eth_hdr(skb); 296 eth = eth_hdr(skb);
297 297
298 if (*eth->h_dest & 1) { 298 if (is_multicast_ether_addr(eth->h_dest)) {
299 if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) 299 if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
300 skb->pkt_type = PACKET_BROADCAST; 300 skb->pkt_type = PACKET_BROADCAST;
301 else 301 else
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index c387852f753a..e3a73cead6b6 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -68,7 +68,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
68 } 68 }
69 } 69 }
70 70
71 if (dest[0] & 1) { 71 if (is_multicast_ether_addr(dest)) {
72 br_flood_forward(br, skb, !passedup); 72 br_flood_forward(br, skb, !passedup);
73 if (!passedup) 73 if (!passedup)
74 br_pass_frame_up(br, skb); 74 br_pass_frame_up(br, skb);
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 9f4dbeb59315..9890fd97e538 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -163,7 +163,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
163 skb_pull(skb,ETH_HLEN); 163 skb_pull(skb,ETH_HLEN);
164 eth = eth_hdr(skb); 164 eth = eth_hdr(skb);
165 165
166 if (*eth->h_dest&1) { 166 if (is_multicast_ether_addr(eth->h_dest)) {
167 if (!compare_ether_addr(eth->h_dest, dev->broadcast)) 167 if (!compare_ether_addr(eth->h_dest, dev->broadcast))
168 skb->pkt_type = PACKET_BROADCAST; 168 skb->pkt_type = PACKET_BROADCAST;
169 else 169 else