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

Commit 47e5d1b0 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

vxlan: move fdb code to common location in vxlan_xmit 



Handle VXLAN_F_COLLECT_METADATA before VXLAN_F_PROXY. The latter does not
make sense with the former, as it needs populated fdb which does not happen
in metadata mode.

After this cleanup, the fdb code in vxlan_xmit is moved to a common location
and can be later skipped for VXLAN-GPE which does not necessarily carry
inner Ethernet header.

v2: changed commit description to not reference L3 mode

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c867c9b

drivers/net/vxlan.c

+11 −11
Original line number Diff line number Diff line
@@ -2106,9 +2106,17 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) 
	info = skb_tunnel_info(skb);



	skb_reset_mac_header(skb);

	eth = eth_hdr(skb);



	if ((vxlan->flags & VXLAN_F_PROXY)) {

	if (vxlan->flags & VXLAN_F_COLLECT_METADATA) {

		if (info && info->mode & IP_TUNNEL_INFO_TX)

			vxlan_xmit_one(skb, dev, NULL, false);

		else

			kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	if (vxlan->flags & VXLAN_F_PROXY) {

		eth = eth_hdr(skb);

		if (ntohs(eth->h_proto) == ETH_P_ARP)

			return arp_reduce(dev, skb);

#if IS_ENABLED(CONFIG_IPV6)
@@ -2123,18 +2131,10 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) 
				    msg->icmph.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION)

					return neigh_reduce(dev, skb);

		}

		eth = eth_hdr(skb);

#endif

	}



	if (vxlan->flags & VXLAN_F_COLLECT_METADATA) {

		if (info && info->mode & IP_TUNNEL_INFO_TX)

			vxlan_xmit_one(skb, dev, NULL, false);

		else

			kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	eth = eth_hdr(skb);

	f = vxlan_find_mac(vxlan, eth->h_dest);

	did_rsc = false;