UPSTREAM: staging/gdm72xx: Include corresponding header file (fix sparse warning)

[cascardo/linux.git] / drivers / staging / gdm72xx / netlink_k.c

diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 1c74b08..7b447e7 100644 (file)
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -11,11 +11,14 @@
  * GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/etherdevice.h>
 #include <linux/netlink.h>
 #include <asm/byteorder.h>
 #include <net/sock.h>
+#include "netlink_k.h"
 
 #if !defined(NLMSG_HDRLEN)
 #define NLMSG_HDRLEN    ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))
@@ -54,8 +57,8 @@ static void netlink_rcv_cb(struct sk_buff *skb)
 
                if (skb->len < nlh->nlmsg_len ||
                nlh->nlmsg_len > ND_MAX_MSG_LEN) {
-                       printk(KERN_ERR "Invalid length (%d,%d)\n", skb->len,
-                               nlh->nlmsg_len);
+                       netdev_err(skb->dev, "Invalid length (%d,%d)\n",
+                                  skb->len, nlh->nlmsg_len);
                        return;
                }
 
@@ -69,10 +72,11 @@ static void netlink_rcv_cb(struct sk_buff *skb)
                                rcv_cb(dev, nlh->nlmsg_type, msg, mlen);
                                dev_put(dev);
                        } else
-                               printk(KERN_ERR "dev_get_by_index(%d) "
-                                       "is not found.\n", ifindex);
+                               netdev_err(skb->dev,
+                                          "dev_get_by_index(%d) is not found.\n",
+                                          ifindex);
                } else
-                       printk(KERN_ERR "Unregistered Callback\n");
+                       netdev_err(skb->dev, "Unregistered Callback\n");
        }
 }
 
@@ -103,7 +107,7 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
 
 void netlink_exit(struct sock *sock)
 {
-       sock_release(sock->sk_socket);
+       netlink_kernel_release(sock);
 }
 
 int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
@@ -114,20 +118,25 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
        int ret = 0;
 
        if (group > ND_MAX_GROUP) {
-               printk(KERN_ERR "Group %d is invalied.\n", group);
-               printk(KERN_ERR "Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
+               pr_err("Group %d is invalied.\n", group);
+               pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP);
                return -EINVAL;
        }
 
        skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC);
        if (!skb) {
-               printk(KERN_ERR "netlink_broadcast ret=%d\n", ret);
+               pr_err("netlink_broadcast ret=%d\n", ret);
                return -ENOMEM;
        }
 
        seq++;
-       nlh = NLMSG_PUT(skb, 0, seq, type, len);
-       memcpy(NLMSG_DATA(nlh), msg, len);
+       nlh = nlmsg_put(skb, 0, seq, type, len, 0);
+       if (!nlh) {
+               kfree_skb(skb);
+               return -EMSGSIZE;
+       }
+
+       memcpy(nlmsg_data(nlh), msg, len);
 
        NETLINK_CB(skb).pid = 0;
        NETLINK_CB(skb).dst_group = 0;
@@ -138,12 +147,11 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
                return len;
        else {
                if (ret != -ESRCH) {
-                       printk(KERN_ERR "netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
-                               group, type, len, ret);
+                       pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n",
+                              group, type, len, ret);
                }
                ret = 0;
        }
 
-nlmsg_failure:
        return ret;
 }