diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-04-14 15:44:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-14 15:44:14 -0400 |
| commit | 87ffabb1f055e14e7d171c6599539a154d647904 (patch) | |
| tree | 56f227c9cb668686ca5c2cd9a7ae188b74c0f2f2 /net/ipv6/ip6_vti.c | |
| parent | Merge branch 'cxgb4-next' (diff) | |
| parent | tcp: tcp_make_synack() should clear skb->tstamp (diff) | |
| download | linux-dev-87ffabb1f055e14e7d171c6599539a154d647904.tar.xz linux-dev-87ffabb1f055e14e7d171c6599539a154d647904.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_vti.c')
| -rw-r--r-- | net/ipv6/ip6_vti.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index b53148444e15..ed9d681207fa 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -288,8 +288,7 @@ static struct ip6_tnl *vti6_locate(struct net *net, struct __ip6_tnl_parm *p, static void vti6_dev_uninit(struct net_device *dev) { struct ip6_tnl *t = netdev_priv(dev); - struct net *net = dev_net(dev); - struct vti6_net *ip6n = net_generic(net, vti6_net_id); + struct vti6_net *ip6n = net_generic(t->net, vti6_net_id); if (dev == ip6n->fb_tnl_dev) RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL); |