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

udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

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

3 files changed, 9 insertions, 8 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 1055164c6232..ecc12411155e 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1492,8 +1492,9 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
                 if (in_range(peers_tol, TIPC_MIN_LINK_TOL, TIPC_MAX_LINK_TOL))
                         l->tolerance = peers_tol;
 
-                if (peers_prio && in_range(peers_prio, TIPC_MIN_LINK_PRI,
-                                           TIPC_MAX_LINK_PRI)) {
+                /* Update own prio if peer indicates a different value */
+                if ((peers_prio != l->priority) &&
+                    in_range(peers_prio, 1, TIPC_MAX_LINK_PRI)) {
                         l->priority = peers_prio;
                         rc = tipc_link_fsm_evt(l, LINK_FAILURE_EVT);
                 }
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index ed97a5876ebe..9e109bb1a207 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -455,14 +455,14 @@ void tipc_mon_rcv(struct net *net, void *data, u16 dlen, u32 addr,
         int i, applied_bef;
 
         state->probing = false;
-        if (!dlen)
-                return;
 
         /* Sanity check received domain record */
-        if ((dlen < new_dlen) || ntohs(arrv_dom->len) != new_dlen) {
-                pr_warn_ratelimited("Received illegal domain record\n");
+        if (dlen < dom_rec_len(arrv_dom, 0))
+                return;
+        if (dlen != dom_rec_len(arrv_dom, new_member_cnt))
+                return;
+        if ((dlen < new_dlen) || ntohs(arrv_dom->len) != new_dlen)
                 return;
-        }
 
         /* Synch generation numbers with peer if link just came up */
         if (!state->synched) {
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 4916d8fea328..333c5dae0072 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -184,7 +184,7 @@ static struct tipc_sock *tipc_sk(const struct sock *sk)
 
 static bool tsk_conn_cong(struct tipc_sock *tsk)
 {
-        return tsk->snt_unacked >= tsk->snd_win;
+        return tsk->snt_unacked > tsk->snd_win;
 }
 
 /* tsk_blocks(): translate a buffer size in bytes to number of