diff options
| author |   stephen hemminger <shemminger@vyatta.com> | 2012-10-09 20:35:49 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-10-10 22:41:21 -0400 |
| commit | 1cad87156b3e79d25731cdcbfa9e149bf3e08f60 (patch) | |
| tree | d527f08da5483f90a7cbffc460a75cf842621e4b /drivers/net/vxlan.c | |
| parent | vxlan: use ip_route_output (diff) | |
| download | linux-dev-1cad87156b3e79d25731cdcbfa9e149bf3e08f60.tar.xz linux-dev-1cad87156b3e79d25731cdcbfa9e149bf3e08f60.zip | |
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: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 0b53a9cb6f84..43887d927775 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -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); |