提交 dbbc0988 编写于 作者: K Kris Katterjohn 提交者: David S. Miller

[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: NKris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d99cf9d6
...@@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev)
unsigned char *rawp; unsigned char *rawp;
eth = eth_hdr(skb); 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) if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
skb->pkt_type = PACKET_BROADCAST; skb->pkt_type = PACKET_BROADCAST;
else else
......
...@@ -68,7 +68,7 @@ int br_handle_frame_finish(struct sk_buff *skb) ...@@ -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); br_flood_forward(br, skb, !passedup);
if (!passedup) if (!passedup)
br_pass_frame_up(br, skb); br_pass_frame_up(br, skb);
......
...@@ -163,7 +163,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -163,7 +163,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
skb_pull(skb,ETH_HLEN); skb_pull(skb,ETH_HLEN);
eth = eth_hdr(skb); 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)) if (!compare_ether_addr(eth->h_dest, dev->broadcast))
skb->pkt_type = PACKET_BROADCAST; skb->pkt_type = PACKET_BROADCAST;
else else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册