[NET]: Use newer is_multicast_ether_addr() in some files
authorKris Katterjohn <kjak@users.sourceforge.net>
Fri, 6 Jan 2006 21:05:58 +0000 (13:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Jan 2006 21:05:58 +0000 (13:05 -0800)
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>
net/atm/br2684.c
net/bridge/br_input.c
net/ethernet/eth.c

index 72f3f7b8de8012060c33f860322ecd227b45b877..bdb4d89730d21da0ad945d7873f040e4f1633d42 100644 (file)
@@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev)
        unsigned char *rawp;
        eth = eth_hdr(skb);
 
-       if (*eth->h_dest & 1) {
+       if (is_multicast_ether_addr(eth->h_dest)) {
                if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
                        skb->pkt_type = PACKET_BROADCAST;
                else
index c387852f753afaf5b37c62cad02bd3fc2877fac7..e3a73cead6b61f069bb9b0352ffa1ef47b0a858c 100644 (file)
@@ -68,7 +68,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
                }
        }
 
-       if (dest[0] & 1) {
+       if (is_multicast_ether_addr(dest)) {
                br_flood_forward(br, skb, !passedup);
                if (!passedup)
                        br_pass_frame_up(br, skb);
index 9f4dbeb59315765d8acbfcd8917484aa554f0dac..9890fd97e538b6c9a18efb2ae068e8560d530e4b 100644 (file)
@@ -163,7 +163,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
        skb_pull(skb,ETH_HLEN);
        eth = eth_hdr(skb);
        
-       if (*eth->h_dest&1) {
+       if (is_multicast_ether_addr(eth->h_dest)) {
                if (!compare_ether_addr(eth->h_dest, dev->broadcast))
                        skb->pkt_type = PACKET_BROADCAST;
                else