3 files changed, 215 insertions, 5 deletions

diff --git a/net/irda/Makefile b/net/irda/Makefile
index d1366c2a39cb..187f6c563a4b 100644
--- a/net/irda/Makefile
+++ b/net/irda/Makefile
@@ -10,6 +10,6 @@ obj-$(CONFIG_IRCOMM) += ircomm/
 irda-y := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
           irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \
           irttp.o irda_device.o irias_object.o wrapper.o af_irda.o \
-          discovery.o parameters.o irmod.o
+          discovery.o parameters.o irnetlink.o irmod.o
 irda-$(CONFIG_PROC_FS) += irproc.o
 irda-$(CONFIG_SYSCTL) += irsysctl.o
diff --git a/net/irda/irmod.c b/net/irda/irmod.c
index c7fad2c5b9f3..1900937b3328 100644
--- a/net/irda/irmod.c
+++ b/net/irda/irmod.c
@@ -88,16 +88,23 @@ EXPORT_SYMBOL(irda_notify_init);
  */
 static int __init irda_init(void)
 {
+        int ret = 0;
+
         IRDA_DEBUG(0, "%s()\n", __FUNCTION__);
 
         /* Lower layer of the stack */
         irlmp_init();
         irlap_init();
 
+        /* Driver/dongle support */
+        irda_device_init();
+
         /* Higher layers of the stack */
         iriap_init();
         irttp_init();
-        irsock_init();
+        ret = irsock_init();
+        if (ret < 0)
+                goto out_err_1;
 
         /* Add IrDA packet type (Start receiving packets) */
         dev_add_pack(&irda_packet_type);
@@ -107,13 +114,44 @@ static int __init irda_init(void)
         irda_proc_register();
 #endif
 #ifdef CONFIG_SYSCTL
-        irda_sysctl_register();
+        ret = irda_sysctl_register();
+        if (ret < 0)
+                goto out_err_2;
 #endif
 
-        /* Driver/dongle support */
-        irda_device_init();
+        ret = irda_nl_register();
+        if (ret < 0)
+                goto out_err_3;
 
         return 0;
+
+ out_err_3:
+#ifdef CONFIG_SYSCTL
+        irda_sysctl_unregister();
+#endif
+ out_err_2:
+#ifdef CONFIG_PROC_FS
+        irda_proc_unregister();
+#endif
+
+        /* Remove IrDA packet type (stop receiving packets) */
+        dev_remove_pack(&irda_packet_type);
+
+        /* Remove higher layers */
+        irsock_cleanup();
+ out_err_1:
+        irttp_cleanup();
+        iriap_cleanup();
+
+        /* Remove lower layers */
+        irda_device_cleanup();
+        irlap_cleanup(); /* Must be done before irlmp_cleanup()! DB */
+
+        /* Remove middle layer */
+        irlmp_cleanup();
+
+
+        return ret;
 }
 
 /*
@@ -125,6 +163,8 @@ static int __init irda_init(void)
 static void __exit irda_cleanup(void)
 {
         /* Remove External APIs */
+        irda_nl_unregister();
+
 #ifdef CONFIG_SYSCTL
         irda_sysctl_unregister();
 #endif
diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
new file mode 100644
index 000000000000..db716580e1ae
--- /dev/null
+++ b/net/irda/irnetlink.c
@@ -0,0 +1,170 @@
+/*
+ * IrDA netlink layer, for stack configuration.
+ *
+ * Copyright (c) 2007 Samuel Ortiz <samuel@sortiz>
+ *
+ * Partly based on the 802.11 nelink implementation
+ * (see net/wireless/nl80211.c) which is:
+ * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/socket.h>
+#include <linux/irda.h>
+#include <net/sock.h>
+#include <net/irda/irda.h>
+#include <net/irda/irlap.h>
+#include <net/genetlink.h>
+
+
+
+static struct genl_family irda_nl_family = {
+        .id = GENL_ID_GENERATE,
+        .name = IRDA_NL_NAME,
+        .hdrsize = 0,
+        .version = IRDA_NL_VERSION,
+        .maxattr = IRDA_NL_CMD_MAX,
+};
+
+static struct net_device * ifname_to_netdev(struct genl_info *info)
+{
+        char * ifname;
+
+        if (!info->attrs[IRDA_NL_ATTR_IFNAME])
+                return NULL;
+
+        ifname = nla_data(info->attrs[IRDA_NL_ATTR_IFNAME]);
+
+        IRDA_DEBUG(5, "%s(): Looking for %s\n", __FUNCTION__, ifname);
+
+        return dev_get_by_name(ifname);
+}
+
+static int irda_nl_set_mode(struct sk_buff *skb, struct genl_info *info)
+{
+        struct net_device * dev;
+        struct irlap_cb * irlap;
+        u32 mode;
+
+        if (!info->attrs[IRDA_NL_ATTR_MODE])
+                return -EINVAL;
+
+        mode = nla_get_u32(info->attrs[IRDA_NL_ATTR_MODE]);
+
+        IRDA_DEBUG(5, "%s(): Switching to mode: %d\n", __FUNCTION__, mode);
+
+        dev = ifname_to_netdev(info);
+        if (!dev)
+                return -ENODEV;
+
+        irlap = (struct irlap_cb *)dev->atalk_ptr;
+        if (!irlap) {
+                dev_put(dev);
+                return -ENODEV;
+        }
+
+        irlap->mode = mode;
+
+        dev_put(dev);
+
+        return 0;
+}
+
+static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info)
+{
+        struct net_device * dev;
+        struct irlap_cb * irlap;
+        struct sk_buff *msg;
+        void *hdr;
+        int ret = -ENOBUFS;
+
+        dev = ifname_to_netdev(info);
+        if (!dev)
+                return -ENODEV;
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+        if (!msg) {
+                dev_put(dev);
+                return -ENOMEM;
+        }
+
+        irlap = (struct irlap_cb *)dev->atalk_ptr;
+        if (!irlap) {
+                ret = -ENODEV;
+                goto err_out;
+        }
+
+        hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq,
+                          &irda_nl_family, 0,  IRDA_NL_CMD_GET_MODE);
+        if (IS_ERR(hdr)) {
+                ret = PTR_ERR(hdr);
+                goto err_out;
+        }
+
+        if(nla_put_string(msg, IRDA_NL_ATTR_IFNAME,
+                          dev->name));
+                goto err_out;
+
+        if(nla_put_u32(msg, IRDA_NL_ATTR_MODE, irlap->mode))
+                goto err_out;
+
+        genlmsg_end(msg, hdr);
+
+        return genlmsg_unicast(msg, info->snd_pid);
+
+ err_out:
+        nlmsg_free(msg);
+        dev_put(dev);
+
+        return ret;
+}
+
+static struct nla_policy irda_nl_policy[IRDA_NL_ATTR_MAX + 1] = {
+        [IRDA_NL_ATTR_IFNAME] = { .type = NLA_NUL_STRING,
+                                  .len = IFNAMSIZ-1 },
+        [IRDA_NL_ATTR_MODE] = { .type = NLA_U32 },
+};
+
+static struct genl_ops irda_nl_ops[] = {
+        {
+                .cmd = IRDA_NL_CMD_SET_MODE,
+                .doit = irda_nl_set_mode,
+                .policy = irda_nl_policy,
+                .flags = GENL_ADMIN_PERM,
+        },
+        {
+                .cmd = IRDA_NL_CMD_GET_MODE,
+                .doit = irda_nl_get_mode,
+                .policy = irda_nl_policy,
+                /* can be retrieved by unprivileged users */
+        },
+
+};
+
+int irda_nl_register(void)
+{
+        int err, i;
+
+        err = genl_register_family(&irda_nl_family);
+        if (err)
+                return err;
+
+        for (i = 0; i < ARRAY_SIZE(irda_nl_ops); i++) {
+                err = genl_register_ops(&irda_nl_family, &irda_nl_ops[i]);
+                if (err)
+                        goto err_out;
+        }
+        return 0;
+ err_out:
+        genl_unregister_family(&irda_nl_family);
+        return err;
+}
+
+void irda_nl_unregister(void)
+{
+        genl_unregister_family(&irda_nl_family);
+}