summaryrefslogtreecommitdiff
path: root/include/net/if_inet6.h
diff options
context:
space:
mode:
authorJiri Bohac <jbohac@suse.cz>2016-10-13 19:50:02 +0300
committerDavid S. Miller <davem@davemloft.net>2016-10-14 17:59:15 +0300
commit9d6280da39c04832d6abf5f4ecc8175c9aad91c0 (patch)
tree8380fe8fe657e4eadf99780e55158d1d0e2b1dba /include/net/if_inet6.h
parentfc791b6335152c5278dc4a4991bcb2d329f806f9 (diff)
downloadlinux-9d6280da39c04832d6abf5f4ecc8175c9aad91c0.tar.xz
IPv6: Drop the temporary address regen_timer
The randomized interface identifier (rndid) was periodically updated from the regen_timer timer. Simplify the code by updating the rndid only when needed by ipv6_try_regen_rndid(). This makes the follow-up DESYNC_FACTOR fix much simpler. Also it fixes a reference counting error in this error path, where an in6_dev_put was missing: err = addrconf_sysctl_register(ndev); if (err) { ipv6_mc_destroy_dev(ndev); - del_timer(&ndev->regen_timer); snmp6_unregister_dev(ndev); goto err_release; Signed-off-by: Jiri Bohac <jbohac@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/if_inet6.h')
-rw-r--r--include/net/if_inet6.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 515352c6280a..ae707352f463 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -191,7 +191,6 @@ struct inet6_dev {
int dead;
u8 rndid[8];
- struct timer_list regen_timer;
struct list_head tempaddr_list;
struct in6_addr token;