Revert "ipvlan: add L2 check for packets arriving via virtual devices"
authorMahesh Bandewar <maheshb@google.com>
Wed, 13 Dec 2017 22:40:23 +0000 (14:40 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Dec 2017 16:36:53 +0000 (11:36 -0500)
This reverts commit 92ff42645028fa6f9b8aa767718457b9264316b4.

Even though the check added is not that taxing, it's not really needed.
First of all this will be per packet cost and second thing is that the
eth_type_trans() already does this correctly. The excessive scrubbing
in IPvlan was changing the pkt-type skb metadata of the packet which
made it necessary to re-check the mac. The subsequent patch in this
series removes the faulty packet-scrub.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ipvlan/ipvlan_core.c

index 0bc7f72..9774c96 100644 (file)
@@ -322,10 +322,6 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff **pskb,
                if (dev_forward_skb(ipvlan->dev, skb) == NET_RX_SUCCESS)
                        success = true;
        } else {
-               if (!ether_addr_equal_64bits(eth_hdr(skb)->h_dest,
-                                            ipvlan->phy_dev->dev_addr))
-                       skb->pkt_type = PACKET_OTHERHOST;
-
                ret = RX_HANDLER_ANOTHER;
                success = true;
        }