summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorzhang kai <zhangkaiheb@126.com>2021-06-02 18:36:26 +0800
committerDavid S. Miller <davem@davemloft.net>2021-06-03 13:57:36 -0700
commit261ba78cc364ad595cead555a7d2a61471eac165 (patch)
tree2c0d5660eff3ef934b2d9ba9a97d40039252d579 /net
parenta8db57c1d285c758adc7fb43d6e2bad2554106e1 (diff)
sit: set name of device back to struct parms
addrconf_set_sit_dstaddr will use parms->name. Signed-off-by: zhang kai <zhangkaiheb@126.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/sit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index aa98294a3ad3..f7c8110ece5f 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -271,6 +271,9 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net,
if (ipip6_tunnel_create(dev) < 0)
goto failed_free;
+ if (!parms->name[0])
+ strcpy(parms->name, dev->name);
+
return nt;
failed_free: