diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:15:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 17:15:31 +1100 |
| commit | 709e09ab4a8cb7569d1e248b39980fdb0dc8d4a5 (patch) | |
| tree | e37d4483e771627fb341e174377ec33b0552d249 /include | |
| parent | 1e45cefa5c9cbba40b97bc1eae873992ebf114f9 (diff) | |
| parent | 50e1fbdc1c9965b6ddbc5c9900377ff18bbf9ae8 (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/connector.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 7e8ca75d2dad..bcafc942e5e4 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h @@ -42,8 +42,9 @@ #define CN_VAL_DM_USERSPACE_LOG 0x1 #define CN_IDX_DRBD 0x8 #define CN_VAL_DRBD 0x1 +#define CN_KVP_IDX 0x9 /* HyperV KVP */ -#define CN_NETLINK_USERS 8 +#define CN_NETLINK_USERS 9 /* * Maximum connector's message size. @@ -128,14 +129,17 @@ struct cn_dev { struct cn_queue_dev *cbdev; }; -int cn_add_callback(struct cb_id *, char *, void (*callback) (struct cn_msg *, struct netlink_skb_parms *)); +int cn_add_callback(struct cb_id *id, const char *name, + 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)(struct cn_msg *, struct netlink_skb_parms *)); +int cn_queue_add_callback(struct cn_queue_dev *dev, const 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); -struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *); +struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *); void cn_queue_free_dev(struct cn_queue_dev *dev); int cn_cb_equal(struct cb_id *, struct cb_id *); |