2 files changed, 3 insertions, 9 deletions

diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 59c793040498..3cc50e2d3bf5 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -29,9 +29,7 @@
  * Policy Table
  */
 struct ip6addrlbl_entry {
-#ifdef CONFIG_NET_NS
-        struct net *lbl_net;
-#endif
+        possible_net_t lbl_net;
         struct in6_addr prefix;
         int prefixlen;
         int ifindex;
@@ -237,9 +235,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
         newp->addrtype = addrtype;
         newp->label = label;
         INIT_HLIST_NODE(&newp->list);
-#ifdef CONFIG_NET_NS
-        newp->lbl_net = net;
-#endif
+        write_pnet(&newp->lbl_net, net);
         atomic_set(&newp->refcnt, 1);
         return newp;
 }
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 34b682617f50..4b9315aa273e 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -56,9 +56,7 @@
 
 struct mr6_table {
         struct list_head        list;
-#ifdef CONFIG_NET_NS
-        struct net              *net;
-#endif
+        possible_net_t          net;
         u32                     id;
         struct sock             *mroute6_sk;
         struct timer_list       ipmr_expire_timer;