Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eda447e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'macvlan-cleanups' 



Alexander Duyck says:

====================
net: Minor macvlan source mode cleanups

So this patch series is just a few minor cleanups for macvlan source mode.
The first patch addresses double receives when a packet is being routed to
the macvlan destination address, and the other addresses the pkt_type being
updated in cases where it most likely should not be.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e086101b c8c41ea1

drivers/net/macvlan.c

+4 −2
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ static void macvlan_forward_source_one(struct sk_buff *skb, 


	len = nskb->len + ETH_HLEN;

	nskb->dev = dev;



	if (ether_addr_equal_64bits(eth_hdr(skb)->h_dest, dev->dev_addr))

		nskb->pkt_type = PACKET_HOST;



	ret = netif_rx(nskb);
@@ -480,7 +482,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) 
					      struct macvlan_dev, list);

	else

		vlan = macvlan_hash_lookup(port, eth->h_dest);

	if (vlan == NULL)

	if (!vlan || vlan->mode == MACVLAN_MODE_SOURCE)

		return RX_HANDLER_PASS;



	dev = vlan->dev;