diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2013-09-28 02:19:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-01 06:52:52 +0200 |
| commit | 12861b7bc2a32f7d36cdbc2ab5236819fa203836 (patch) | |
| tree | 2fc148251d0450ef62138e2d047dd3e8b30b45ea /net/ethernet/eth.c | |
| parent | Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next (diff) | |
| download | linux-12861b7bc2a32f7d36cdbc2ab5236819fa203836.tar.xz linux-12861b7bc2a32f7d36cdbc2ab5236819fa203836.zip | |
ethernet: cleanup eth_type_trans
Remove old legacy comment and weird if condition.
The comment has outlived it's stay and is throwback to some
early net code (before my time). Maybe Dave remembers what it meant.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet/eth.c')
| -rw-r--r-- | net/ethernet/eth.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 9bd3c31c30e5..f777e17d28c8 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -169,20 +169,9 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) else skb->pkt_type = PACKET_MULTICAST; } - - /* - * This ALLMULTI check should be redundant by 1.4 - * so don't forget to remove it. - * - * Seems, you forgot to remove it. All silly devices - * seems to set IFF_PROMISC. - */ - - else if (1 /*dev->flags&IFF_PROMISC */) { - if (unlikely(!ether_addr_equal_64bits(eth->h_dest, - dev->dev_addr))) - skb->pkt_type = PACKET_OTHERHOST; - } + else if (unlikely(!ether_addr_equal_64bits(eth->h_dest, + dev->dev_addr))) + skb->pkt_type = PACKET_OTHERHOST; /* * Some variants of DSA tagging don't have an ethertype field |