Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 15 insertions, 3 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index b0b840084f0a..6a44eb812baf 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1977,6 +1977,7 @@ out:
 int tipc_nl_node_get_link(struct sk_buff *skb, struct genl_info *info)
 {
         struct net *net = genl_info_net(info);
+        struct nlattr *attrs[TIPC_NLA_LINK_MAX + 1];
         struct tipc_nl_msg msg;
         char *name;
         int err;
@@ -1984,9 +1985,19 @@ int tipc_nl_node_get_link(struct sk_buff *skb, struct genl_info *info)
         msg.portid = info->snd_portid;
         msg.seq = info->snd_seq;
 
-        if (!info->attrs[TIPC_NLA_LINK_NAME])
+        if (!info->attrs[TIPC_NLA_LINK])
                 return -EINVAL;
-        name = nla_data(info->attrs[TIPC_NLA_LINK_NAME]);
+
+        err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX,
+                               info->attrs[TIPC_NLA_LINK],
+                               tipc_nl_link_policy, info->extack);
+        if (err)
+                return err;
+
+        if (!attrs[TIPC_NLA_LINK_NAME])
+                return -EINVAL;
+
+        name = nla_data(attrs[TIPC_NLA_LINK_NAME]);
 
         msg.skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
         if (!msg.skb)
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index c4992002fd68..930852c54d7a 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1516,10 +1516,10 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
 
         srcaddr->sock.family = AF_TIPC;
         srcaddr->sock.addrtype = TIPC_ADDR_ID;
+        srcaddr->sock.scope = 0;
         srcaddr->sock.addr.id.ref = msg_origport(hdr);
         srcaddr->sock.addr.id.node = msg_orignode(hdr);
         srcaddr->sock.addr.name.domain = 0;
-        srcaddr->sock.scope = 0;
         m->msg_namelen = sizeof(struct sockaddr_tipc);
 
         if (!msg_in_group(hdr))
@@ -1528,6 +1528,7 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
         /* Group message users may also want to know sending member's id */
         srcaddr->member.family = AF_TIPC;
         srcaddr->member.addrtype = TIPC_ADDR_NAME;
+        srcaddr->member.scope = 0;
         srcaddr->member.addr.name.name.type = msg_nametype(hdr);
         srcaddr->member.addr.name.name.instance = TIPC_SKB_CB(skb)->orig_member;
         srcaddr->member.addr.name.domain = 0;