ipv4: don't remove /proc/net/rt_acct

[safe/jmp/linux-2.6] / include / linux / connector.h

diff --git a/include/linux/connector.h b/include/linux/connector.h
index b9966e6..72ba63e 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -41,8 +41,12 @@
 #define CN_IDX_BB                      0x5     /* BlackBoard, from the TSP GPL sampling framework */
 #define CN_DST_IDX                     0x6
 #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               7
+#define CN_NETLINK_USERS               8
 
 /*
  * Maximum connector's message size.
@@ -130,11 +134,8 @@ struct cn_callback_id {
 };
 
 struct cn_callback_data {
-       void (*destruct_data) (void *);
-       void *ddata;
-       
-       void *callback_priv;
-       void (*callback) (void *);
+       struct sk_buff *skb;
+       void (*callback) (struct cn_msg *, struct netlink_skb_parms *);
 
        void *free;
 };
@@ -165,11 +166,11 @@ struct cn_dev {
        struct cn_queue_dev *cbdev;
 };
 
-int cn_add_callback(struct cb_id *, char *, void (*callback) (void *));
+int cn_add_callback(struct cb_id *, char *, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));
 void cn_del_callback(struct cb_id *);
 int cn_netlink_send(struct cn_msg *, u32, gfp_t);
 
-int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *));
+int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(struct cn_msg *, struct netlink_skb_parms *));
 void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
 
 int queue_cn_work(struct cn_callback_entry *cbq, struct work_struct *work);