diff options
author | David S. Miller <davem@davemloft.net> | 2005-07-24 22:30:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-24 22:30:28 -0400 |
commit | 48647feed9f7a2d839c6ada12147b341833646e8 (patch) | |
tree | a98aa36be19ce7706cef71418f143d30af28b899 | |
parent | 227510c7f175c44b12cdff6eab316e53dbf71f92 (diff) |
[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>
-rw-r--r-- | drivers/w1/w1_int.c | 2 | ||||
-rw-r--r-- | include/linux/netlink.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 35e85d961702..b5a5e04b6d37 100644 --- 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, | |||
88 | 88 | ||
89 | dev->groups = 23; | 89 | dev->groups = 23; |
90 | dev->seq = 1; | 90 | dev->seq = 1; |
91 | dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL); | 91 | dev->nls = netlink_kernel_create(NETLINK_W1, NULL); |
92 | if (!dev->nls) { | 92 | if (!dev->nls) { |
93 | printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", | 93 | printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", |
94 | NETLINK_NFLOG, dev->dev.bus_id); | 94 | NETLINK_NFLOG, dev->dev.bus_id); |
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 2f0c085f2c7d..70c2a9dc4b2b 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | 6 | ||
7 | #define NETLINK_ROUTE 0 /* Routing/device hook */ | 7 | #define NETLINK_ROUTE 0 /* Routing/device hook */ |
8 | #define NETLINK_SKIP 1 /* Reserved for ENskip */ | 8 | #define NETLINK_W1 1 /* 1-wire subsystem */ |
9 | #define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ | 9 | #define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ |
10 | #define NETLINK_FIREWALL 3 /* Firewalling hook */ | 10 | #define NETLINK_FIREWALL 3 /* Firewalling hook */ |
11 | #define NETLINK_TCPDIAG 4 /* TCP socket monitoring */ | 11 | #define NETLINK_TCPDIAG 4 /* TCP socket monitoring */ |