diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-22 15:33:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-22 15:33:51 -0800 |
| commit | eddf26515f8563a8ed7302a487465bfd0cf8eccd (patch) | |
| tree | c8f0fe6e29f0150f26b8ebfd687d4785a6846b29 /0001-kdbus-interprocess-message-router.patch | |
| parent | 7f23b49c7d696ac1f17965c22c8770a97ab90287 (diff) | |
| download | patches-eddf26515f8563a8ed7302a487465bfd0cf8eccd.tar.gz | |
more frameworks to be filled in later added (poll and mmap)
Diffstat (limited to '0001-kdbus-interprocess-message-router.patch')
| -rw-r--r-- | 0001-kdbus-interprocess-message-router.patch | 56 |
1 files changed, 40 insertions, 16 deletions
diff --git a/0001-kdbus-interprocess-message-router.patch b/0001-kdbus-interprocess-message-router.patch index c559a7b15800d2..04b341e89f2e97 100644 --- a/0001-kdbus-interprocess-message-router.patch +++ b/0001-kdbus-interprocess-message-router.patch @@ -8,15 +8,15 @@ Nothing to see here, move along... drivers/Makefile | 1 drivers/kdbus/Kconfig | 5 drivers/kdbus/Makefile | 4 - drivers/kdbus/bus.c | 115 ++++++++++++ - drivers/kdbus/ep.c | 189 +++++++++++++++++++ - drivers/kdbus/kdbus.c | 429 +++++++++++++++++++++++++++++++++++++++++++++ - drivers/kdbus/kdbus.h | 160 ++++++++++++++++ - drivers/kdbus/ns.c | 208 +++++++++++++++++++++ - include/uapi/kdbus/kdbus.h | 86 +++++++++ + drivers/kdbus/bus.c | 115 +++++++++++ + drivers/kdbus/ep.c | 189 ++++++++++++++++++ + drivers/kdbus/kdbus.c | 453 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/kdbus/kdbus.h | 160 +++++++++++++++ + drivers/kdbus/ns.c | 208 ++++++++++++++++++++ + include/uapi/kdbus/kdbus.h | 86 ++++++++ include/uapi/linux/major.h | 2 - kdbus.c | 77 ++++++++ - 12 files changed, 1278 insertions(+) + kdbus.c | 77 +++++++ + 12 files changed, 1302 insertions(+) --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -361,7 +361,7 @@ Nothing to see here, move along... + --- /dev/null +++ b/drivers/kdbus/kdbus.c -@@ -0,0 +1,429 @@ +@@ -0,0 +1,453 @@ +/* + * kdbus - interprocess message routing + * @@ -578,6 +578,18 @@ Nothing to see here, move along... + conn->bus_owner = bus; + break; + ++#if 0 /* FIXME Don't know if we really want this... */ ++ case KDBUS_CMD_BUS_REMOVE: ++ if (copy_from_user(&name, argp, sizeof(struct kdbus_cmd_name))) ++ return -EFAULT; ++ ++ bus = kdbus_bus_find(name.name); ++ if (!bus) ++ return -EINVAL; ++ kdbus_bus_disconnect(bus); // FIXME needed? ++ kdbus_bus_unref(bus); ++ break; ++#endif + case KDBUS_CMD_NS_CREATE: + if (copy_from_user(&name, argp, sizeof(struct kdbus_cmd_name))) + return -EFAULT; @@ -603,7 +615,6 @@ Nothing to see here, move along... + return -EINVAL; + + kdbus_ns_unref(ns); -+ return 0; + break; + + default: @@ -706,13 +717,26 @@ Nothing to see here, move along... + } +} + ++static unsigned int kdbus_conn_poll(struct file *filep, ++ struct poll_table_struct *wait) ++{ ++ return 0; ++} ++ ++static int kdbus_conn_mmap(struct file *filep, struct vm_area_struct *vma) ++{ ++ return -EINVAL; ++} ++ +const struct file_operations kdbus_device_ops = { -+ .owner = THIS_MODULE, -+ .open = kdbus_conn_open, -+ .release = kdbus_conn_release, -+ .unlocked_ioctl = kdbus_conn_ioctl, -+ .compat_ioctl = kdbus_conn_ioctl, -+ .llseek = noop_llseek, ++ .owner = THIS_MODULE, ++ .open = kdbus_conn_open, ++ .release = kdbus_conn_release, ++ .unlocked_ioctl = kdbus_conn_ioctl, ++ .compat_ioctl = kdbus_conn_ioctl, ++ .poll = kdbus_conn_poll, ++ .mmap = kdbus_conn_mmap, ++ .llseek = noop_llseek, +}; + +static void kdbus_msg_free(struct kdbus_msg *msg) |