Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / drivers / staging / gdm72xx / netlink_k.c

diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 51665132c61b8057e6158d63ee5a595504308225..3abb31df8f28289a2cdad7a5c41c1ab3063123e2 100644 (file)
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/etherdevice.h>
 #include <linux/netlink.h>
@@ -88,13 +87,15 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
                                                void *msg, int len))
 {
        struct sock *sock;
+       struct netlink_kernel_cfg cfg = {
+               .input  = netlink_rcv,
+       };
 
 #if !defined(DEFINE_MUTEX)
        init_MUTEX(&netlink_mutex);
 #endif
 
-       sock = netlink_kernel_create(&init_net, unit, 0, netlink_rcv, NULL,
-                                       THIS_MODULE);
+       sock = netlink_kernel_create(&init_net, unit, THIS_MODULE, &cfg);
 
        if (sock)
                rcv_cb = cb;
@@ -127,8 +128,12 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
        }
 
        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;
@@ -144,7 +149,5 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
                }
                ret = 0;
        }
-
-nlmsg_failure:
        return ret;
 }