[PATCH 4/14] [PATCH] w1: Move w1-connector definitions into linux/include/connector.h

From: Evgeniy Polyakov <[email protected]>

Signed-off-by: Evgeniy Polyakov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/w1/w1_netlink.h   |    3 ---
 include/linux/connector.h |    5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index 5644221..56122b9 100644
--- a/drivers/w1/w1_netlink.h
+++ b/drivers/w1/w1_netlink.h
@@ -27,9 +27,6 @@ #include <linux/connector.h>
 
 #include "w1.h"
 
-#define CN_W1_IDX	3
-#define CN_W1_VAL	1
-
 enum w1_netlink_message_types {
 	W1_SLAVE_ADD = 0,
 	W1_SLAVE_REMOVE,
diff --git a/include/linux/connector.h b/include/linux/connector.h
index ad1a22c..4c02119 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -34,8 +34,11 @@ #define CN_IDX_PROC			0x1
 #define CN_VAL_PROC			0x1
 #define CN_IDX_CIFS			0x2
 #define CN_VAL_CIFS                     0x1
+#define CN_W1_IDX			0x3	/* w1 communication */
+#define CN_W1_VAL			0x1
 
-#define CN_NETLINK_USERS		1
+
+#define CN_NETLINK_USERS		4
 
 /*
  * Maximum connector's message size.
-- 
1.4.0

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 5/14] [PATCH] w1: netlink: Mark netlink group 1 as unused.
    • From: Greg KH <[email protected]>

• References:
  • [GIT PATCH] W1 patches for 2.6.17
    • From: Greg KH <[email protected]>
  • [PATCH 1/14] [PATCH] w1: Added default generic read/write operations.
    • From: Greg KH <[email protected]>
  • [PATCH 2/14] [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver.
    • From: Greg KH <[email protected]>
  • [PATCH 3/14] [PATCH] w1: Userspace communication protocol over connector.
    • From: Greg KH <[email protected]>

• Prev by Date: [PATCH 14/14] [PATCH] w1: warning fix
• Next by Date: [PATCH 3/14] [PATCH] w1: Userspace communication protocol over connector.
• Previous by thread: [PATCH 3/14] [PATCH] w1: Userspace communication protocol over connector.
• Next by thread: [PATCH 5/14] [PATCH] w1: netlink: Mark netlink group 1 as unused.
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]