diff options
| author | Nicolas Dichtel | 2013-07-03 17:00:34 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-07-04 23:55:47 +0200 |
| commit | 86bd68bfd75941d4cf3b874468791c3e73eef23d (patch) | |
| tree | 1323b8cdf16ae66b8d475b1387b71509f40554c4 | |
| parent | dt:net:stmmac: Add dt specific phy reset callback support. (diff) | |
| download | kernel-qcow2-linux-86bd68bfd75941d4cf3b874468791c3e73eef23d.tar.gz kernel-qcow2-linux-86bd68bfd75941d4cf3b874468791c3e73eef23d.tar.xz kernel-qcow2-linux-86bd68bfd75941d4cf3b874468791c3e73eef23d.zip | |
sit: fix tunnel update via netlink
The device can stand in another netns, hence we need to do the lookup in netns
tunnel->net.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 85ff37b1ce02..a3437a4cd07e 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1426,9 +1426,9 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev, static int ipip6_changelink(struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) { - struct ip_tunnel *t; + struct ip_tunnel *t = netdev_priv(dev); struct ip_tunnel_parm p; - struct net *net = dev_net(dev); + struct net *net = t->net; struct sit_net *sitn = net_generic(net, sit_net_id); #ifdef CONFIG_IPV6_SIT_6RD struct ip_tunnel_6rd ip6rd; |