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

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

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

1 files changed, 4 insertions, 1 deletions

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index e10624aa6959..9722bf839d9d 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -1015,8 +1015,10 @@ void rds_ib_recv_cqe_handler(struct rds_ib_connection *ic,
         if (rds_ib_ring_empty(&ic->i_recv_ring))
                 rds_ib_stats_inc(s_ib_rx_ring_empty);
 
-        if (rds_ib_ring_low(&ic->i_recv_ring))
+        if (rds_ib_ring_low(&ic->i_recv_ring)) {
                 rds_ib_recv_refill(conn, 0, GFP_NOWAIT);
+                rds_ib_stats_inc(s_ib_rx_refill_from_cq);
+        }
 }
 
 int rds_ib_recv_path(struct rds_conn_path *cp)
@@ -1029,6 +1031,7 @@ int rds_ib_recv_path(struct rds_conn_path *cp)
         if (rds_conn_up(conn)) {
                 rds_ib_attempt_ack(ic);
                 rds_ib_recv_refill(conn, 0, GFP_KERNEL);
+                rds_ib_stats_inc(s_ib_rx_refill_from_thread);
         }
 
         return ret;