| Message ID | 20210602103626.26873-1-zhangkaiheb@126.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 261ba78cc364ad595cead555a7d2a61471eac165 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | sit: set name of device back to struct parms | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Wed, 2 Jun 2021 18:36:26 +0800 you wrote: > addrconf_set_sit_dstaddr will use parms->name. > > Signed-off-by: zhang kai <zhangkaiheb@126.com> > --- > net/ipv6/sit.c | 3 +++ > 1 file changed, 3 insertions(+) Here is the summary with links: - sit: set name of device back to struct parms https://git.kernel.org/netdev/net/c/261ba78cc364 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 71b57bdb1..e0a39b0bb 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:
addrconf_set_sit_dstaddr will use parms->name. Signed-off-by: zhang kai <zhangkaiheb@126.com> --- net/ipv6/sit.c | 3 +++ 1 file changed, 3 insertions(+)