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

Commit 1cad8715 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

vxlan: associate with tunnel socket on transmit 



When tunnelling a skb, associate it with the tunnel socket.
This allows parameters set on tunnel socket (like multicast loop
flag), to be picked up by ip_output.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca78f181

drivers/net/vxlan.c

+19 −0
Original line number Diff line number Diff line
@@ -637,6 +637,23 @@ static __be32 vxlan_find_dst(struct vxlan_dev *vxlan, struct sk_buff *skb) 


}



static void vxlan_sock_free(struct sk_buff *skb)

{

	sock_put(skb->sk);

}



/* On transmit, associate with the tunnel socket */

static void vxlan_set_owner(struct net_device *dev, struct sk_buff *skb)

{

	struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);

	struct sock *sk = vn->sock->sk;



	skb_orphan(skb);

	sock_hold(sk);

	skb->sk = sk;

	skb->destructor = vxlan_sock_free;

}



/* Transmit local packets over Vxlan

 *

 * Outer IP header inherits ECN and DF from inner header.
@@ -732,6 +749,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) 
	iph->saddr	= fl4.saddr;

	iph->ttl	= ttl ? : ip4_dst_hoplimit(&rt->dst);



	vxlan_set_owner(dev, skb);



	/* See __IPTUNNEL_XMIT */

	skb->ip_summed = CHECKSUM_NONE;

	ip_select_ident(iph, &rt->dst, NULL);