3 files changed, 8 insertions, 12 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index cf465d66ccde..69cd9bf3f561 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2358,7 +2358,8 @@ int tipc_link_recv_fragment(struct sk_buff **head, struct sk_buff **tail,
                 *head = frag;
                 skb_frag_list_init(*head);
                 return 0;
-        } else if (skb_try_coalesce(*head, frag, &headstolen, &delta)) {
+        } else if (*head &&
+                   skb_try_coalesce(*head, frag, &headstolen, &delta)) {
                 kfree_skb_partial(frag, headstolen);
         } else {
                 if (!*head)
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 8bcd4985d0fb..9f72a6376362 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -76,9 +76,11 @@ static struct genl_family tipc_genl_family = {
         .maxattr        = 0,
 };
 
-static struct genl_ops tipc_genl_ops = {
-        .cmd            = TIPC_GENL_CMD,
-        .doit           = handle_cmd,
+static struct genl_ops tipc_genl_ops[] = {
+        {
+                .cmd            = TIPC_GENL_CMD,
+                .doit           = handle_cmd,
+        },
 };
 
 static int tipc_genl_family_registered;
@@ -87,8 +89,7 @@ int tipc_netlink_start(void)
 {
         int res;
 
-        res = genl_register_family_with_ops(&tipc_genl_family,
-                &tipc_genl_ops, 1);
+        res = genl_register_family_with_ops(&tipc_genl_family, tipc_genl_ops);
         if (res) {
                 pr_err("Failed to register netlink interface\n");
                 return res;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 3906527259d1..3b61851bb927 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -980,9 +980,6 @@ static int recv_msg(struct kiocb *iocb, struct socket *sock,
                 goto exit;
         }
 
-        /* will be updated in set_orig_addr() if needed */
-        m->msg_namelen = 0;
-
         timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
 restart:
 
@@ -1091,9 +1088,6 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
                 goto exit;
         }
 
-        /* will be updated in set_orig_addr() if needed */
-        m->msg_namelen = 0;
-
         target = sock_rcvlowat(sk, flags & MSG_WAITALL, buf_len);
         timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);