tree a98aa36be19ce7706cef71418f143d30af28b899
parent 227510c7f175c44b12cdff6eab316e53dbf71f92
author David S. Miller <[EMAIL PROTECTED]> Mon, 25 Jul 2005 09:30:28 -0700
committer David S. Miller <[EMAIL PROTECTED]> Mon, 25 Jul 2005 09:30:28 -0700
[W1]: Do not use NFLOG netlink number.
Use the reserved by never used NETLINK_SKIP value instead.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
drivers/w1/w1_int.c | 2 +-
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
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -88,7 +88,7 @@ static struct w1_master * w1_alloc_dev(u
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
--- 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
*/
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
