aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrlabel.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-03-12 00:04:08 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-12 14:39:40 -0400
commitefd7ef1c1929d7a0329d4349252863c04d6f1729 (patch)
tree66a1d5ba57a27fda7665da756551c10ac0ebf656 /net/ipv6/addrlabel.c
parent6c7005f6cb1bf63bb1f505ef69364fb2cc00628e (diff)
net: Kill hold_net release_net
hold_net and release_net were an idea that turned out to be useless. The code has been disabled since 2008. Kill the code it is long past due. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrlabel.c')
-rw-r--r--net/ipv6/addrlabel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index e43e79d0a612..59c793040498 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -129,9 +129,6 @@ static const __net_initconst struct ip6addrlbl_init_table
129/* Object management */ 129/* Object management */
130static inline void ip6addrlbl_free(struct ip6addrlbl_entry *p) 130static inline void ip6addrlbl_free(struct ip6addrlbl_entry *p)
131{ 131{
132#ifdef CONFIG_NET_NS
133 release_net(p->lbl_net);
134#endif
135 kfree(p); 132 kfree(p);
136} 133}
137 134
@@ -241,7 +238,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
241 newp->label = label; 238 newp->label = label;
242 INIT_HLIST_NODE(&newp->list); 239 INIT_HLIST_NODE(&newp->list);
243#ifdef CONFIG_NET_NS 240#ifdef CONFIG_NET_NS
244 newp->lbl_net = hold_net(net); 241 newp->lbl_net = net;
245#endif 242#endif
246 atomic_set(&newp->refcnt, 1); 243 atomic_set(&newp->refcnt, 1);
247 return newp; 244 return newp;