From 4fd0b1aa9f43b82017951ad0628d635e474afc01 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 24 Jul 2005 19:30:28 -0700 Subject: [PATCH] --- yaml --- r: 4966 b: refs/heads/master c: 48647feed9f7a2d839c6ada12147b341833646e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/w1/w1_int.c | 2 +- trunk/include/linux/netlink.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5aa60b8cca06..3f818a31c4bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 227510c7f175c44b12cdff6eab316e53dbf71f92 +refs/heads/master: 48647feed9f7a2d839c6ada12147b341833646e8 diff --git a/trunk/drivers/w1/w1_int.c b/trunk/drivers/w1/w1_int.c index 35e85d961702..b5a5e04b6d37 100644 --- a/trunk/drivers/w1/w1_int.c +++ b/trunk/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/trunk/include/linux/netlink.h b/trunk/include/linux/netlink.h index 2f0c085f2c7d..70c2a9dc4b2b 100644 --- a/trunk/include/linux/netlink.h +++ b/trunk/include/linux/netlink.h @@ -5,7 +5,7 @@ #include #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 */