drbd: moved CN_IDX_DRBD and CN_VAL_DRBD to the right file

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/include/linux/connector.h b/include/linux/connector.h
index 3a14615fd35c57cb2c42940c8f3e0e3dd9c78c9b..72ba63eb83c50d38b06d53a96955919ce3a17dfc 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -43,6 +43,8 @@
 #define CN_DST_VAL                     0x1
 #define CN_IDX_DM                      0x7     /* Device Mapper */
 #define CN_VAL_DM_USERSPACE_LOG                0x1
+#define CN_IDX_DRBD                    0x8
+#define CN_VAL_DRBD                    0x1
 
 #define CN_NETLINK_USERS               8
 

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 99a4d76694eda62e7be2ac067a6cc9f2957bb5b4..e84f4733cb55393a67ae15362dd2d7d8eb2aae8d 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -322,13 +322,6 @@ enum drbd_timeout_flag {
 #define DRBD_NL_CREATE_DEVICE 0x01
 #define DRBD_NL_SET_DEFAULTS  0x02
 
-/* The following line should be moved over to linux/connector.h
- * when the time comes */
-#ifndef CN_IDX_DRBD
-# define CN_IDX_DRBD                   0x4
-/* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */
-#endif
-#define CN_VAL_DRBD                    0x1
 
 /* For searching a vacant cn_idx value */
 #define CN_IDX_STEP                    6977