ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer

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

diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
index cd9ff176ecde7b81370f0891763fd1352ba240f2..2f05ec1037ab32322838dfd2cf851e66050ceb0c 100644 (file)
--- a/net/irda/irnetlink.c
+++ b/net/irda/irnetlink.c
@@ -40,7 +40,7 @@ static struct net_device * ifname_to_netdev(struct net *net, struct genl_info *i
 
        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(net, ifname);
 }
@@ -56,7 +56,7 @@ 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(&init_net, info);
        if (!dev)
@@ -101,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;
        }