[W1]: Do not use NFLOG netlink number.

Use the reserved by never used NETLINK_SKIP value instead.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 35e85d961702cb92664c65b0261f53199d5f4b9f..b5a5e04b6d37fb172256595c3e905a22f3378d6c 100644 (file)
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -88,7 +88,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
 
        dev->groups = 23;
        dev->seq = 1;
-       dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL);
+       dev->nls = netlink_kernel_create(NETLINK_W1, NULL);
        if (!dev->nls) {
                printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n",
                        NETLINK_NFLOG, dev->dev.bus_id);

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 2f0c085f2c7d46e39a4137122e6036dd692c67f6..70c2a9dc4b2b73bf6d61c2f17b6f83228c671451 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -5,7 +5,7 @@
 #include <linux/types.h>
 
 #define NETLINK_ROUTE          0       /* Routing/device hook                          */
-#define NETLINK_SKIP           1       /* Reserved for ENskip                          */
+#define NETLINK_W1             1       /* 1-wire subsystem                             */
 #define NETLINK_USERSOCK       2       /* Reserved for user mode socket protocols      */
 #define NETLINK_FIREWALL       3       /* Firewalling hook                             */
 #define NETLINK_TCPDIAG                4       /* TCP socket monitoring                        */