Skip to content

Commit

Permalink
Revert "ipvlan: add L2 check for packets arriving via virtual devices"
Browse files Browse the repository at this point in the history
This reverts commit 92ff426.

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>
  • Loading branch information
Mahesh Bandewar authored and David S. Miller committed Dec 15, 2017
1 parent 8ce38ae commit 918150c
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/net/ipvlan/ipvlan_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 918150c

Please sign in to comment.