Merge branch 'ipv6_stable_privacy_address'

[firefly-linux-kernel-4.4.55.git] / include / net / genetlink.h

diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 0574abd3db86bc0a796819a387dfc751adfcb04d..a9af1cc8c1bc6089d0facdf56001274cf7993a5a 100644 (file)
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -92,9 +92,7 @@ struct genl_info {
        struct genlmsghdr *     genlhdr;
        void *                  userhdr;
        struct nlattr **        attrs;
-#ifdef CONFIG_NET_NS
-       struct net *            _net;
-#endif
+       possible_net_t          _net;
        void *                  user_ptr[2];
        struct sock *           dst_sk;
 };