diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-18 09:39:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-18 09:39:21 -0400 |
| commit | 49c87cd1eac1f798c5bad7f7eb809e6df36b6c56 (patch) | |
| tree | 8d6905466a05d6539e06d189cf88b71095ac0a79 /drivers/net/vxlan.c | |
| parent | 4969b41798e512689bba57c8c44d873216eba814 (diff) | |
| parent | 9437a248e7cac427c898bdb11bd1ac6844a1ead4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/nfc/llcp/llcp.c
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index f10e58ac9c1b..c3e3d2929ee3 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
| @@ -961,6 +961,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 961 | iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); | 961 | iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); |
| 962 | tunnel_ip_select_ident(skb, old_iph, &rt->dst); | 962 | tunnel_ip_select_ident(skb, old_iph, &rt->dst); |
| 963 | 963 | ||
| 964 | nf_reset(skb); | ||
| 965 | |||
| 964 | vxlan_set_owner(dev, skb); | 966 | vxlan_set_owner(dev, skb); |
| 965 | 967 | ||
| 966 | /* See iptunnel_xmit() */ | 968 | /* See iptunnel_xmit() */ |