merge sock_alloc_fd/sock_attach_fd into a new helper

[safe/jmp/linux-2.6] / net / irda / irnetlink.c

diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
index 1e429c9..476b307 100644 (file)
--- a/net/irda/irnetlink.c
+++ b/net/irda/irnetlink.c
@@ -15,6 +15,7 @@
 
 #include <linux/socket.h>
 #include <linux/irda.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/irda/irda.h>
 #include <net/irda/irlap.h>
@@ -30,7 +31,7 @@ static struct genl_family irda_nl_family = {
        .maxattr = IRDA_NL_CMD_MAX,
 };
 
-static struct net_device * ifname_to_netdev(struct genl_info *info)
+static struct net_device * ifname_to_netdev(struct net *net, struct genl_info *info)
 {
        char * ifname;
 
@@ -39,9 +40,9 @@ static struct net_device * ifname_to_netdev(struct genl_info *info)
 
        ifname = nla_data(info->attrs[IRDA_NL_ATTR_IFNAME]);
 
-       IRDA_DEBUG(5, "%s(): Looking for %s\n", __FUNCTION__, ifname);
+       IRDA_DEBUG(5, "%s(): Looking for %s\n", __func__, ifname);
 
-       return dev_get_by_name(ifname);
+       return dev_get_by_name(net, ifname);
 }
 
 static int irda_nl_set_mode(struct sk_buff *skb, struct genl_info *info)
@@ -55,9 +56,9 @@ static int irda_nl_set_mode(struct sk_buff *skb, struct genl_info *info)
 
        mode = nla_get_u32(info->attrs[IRDA_NL_ATTR_MODE]);
 
-       IRDA_DEBUG(5, "%s(): Switching to mode: %d\n", __FUNCTION__, mode);
+       IRDA_DEBUG(5, "%s(): Switching to mode: %d\n", __func__, mode);
 
-       dev = ifname_to_netdev(info);
+       dev = ifname_to_netdev(&init_net, info);
        if (!dev)
                return -ENODEV;
 
@@ -82,11 +83,11 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info)
        void *hdr;
        int ret = -ENOBUFS;
 
-       dev = ifname_to_netdev(info);
+       dev = ifname_to_netdev(&init_net, info);
        if (!dev)
                return -ENODEV;
 
-       msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+       msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
        if (!msg) {
                dev_put(dev);
                return -ENOMEM;
@@ -100,8 +101,8 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info)
 
        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);
+       if (hdr == NULL) {
+               ret = -EMSGSIZE;
                goto err_out;
        }
 
@@ -114,7 +115,7 @@ static int irda_nl_get_mode(struct sk_buff *skb, struct genl_info *info)
 
        genlmsg_end(msg, hdr);
 
-       return genlmsg_unicast(msg, info->snd_pid);
+       return genlmsg_reply(msg, info);
 
  err_out:
        nlmsg_free(msg);
@@ -147,21 +148,8 @@ static struct genl_ops irda_nl_ops[] = {
 
 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;
+       return genl_register_family_with_ops(&irda_nl_family,
+               irda_nl_ops, ARRAY_SIZE(irda_nl_ops));
 }
 
 void irda_nl_unregister(void)