Commit 918150cb authored by Mahesh Bandewar's avatar Mahesh Bandewar Committed by David S. Miller

Revert "ipvlan: add L2 check for packets arriving via virtual devices"

This reverts commit 92ff4264.

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: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ce38aeb
...@@ -322,10 +322,6 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff **pskb, ...@@ -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) if (dev_forward_skb(ipvlan->dev, skb) == NET_RX_SUCCESS)
success = true; success = true;
} else { } 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; ret = RX_HANDLER_ANOTHER;
success = true; success = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment