Merge tag 'v3.13' into stable-3.14

Linux 3.13

Conflicts:
	security/selinux/hooks.c

Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think).  Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 36808bf25677..e59acb1daa23 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -277,12 +277,13 @@ static void xennet_alloc_rx_buffers(struct net_device *dev)
                 if (!page) {
                         kfree_skb(skb);
 no_skb:
-                        /* Any skbuffs queued for refill? Force them out. */
-                        if (i != 0)
-                                goto refill;
                         /* Could not allocate any skbuffs. Try again later. */
                         mod_timer(&np->rx_refill_timer,
                                   jiffies + (HZ/10));
+
+                        /* Any skbuffs queued for refill? Force them out. */
+                        if (i != 0)
+                                goto refill;
                         break;
                 }
 
@@ -952,7 +953,7 @@ static int handle_incoming_queue(struct net_device *dev,
                 u64_stats_update_end(&stats->syncp);
 
                 /* Pass it up. */
-                netif_receive_skb(skb);
+                napi_gro_receive(&np->napi, skb);
         }
 
         return packets_dropped;
@@ -1051,6 +1052,8 @@ err:
         if (work_done < budget) {
                 int more_to_do = 0;
 
+                napi_gro_flush(napi, false);
+
                 local_irq_save(flags);
 
                 RING_FINAL_CHECK_FOR_RESPONSES(&np->rx, more_to_do);
@@ -1338,6 +1341,12 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
         if (np->stats == NULL)
                 goto exit;
 
+        for_each_possible_cpu(i) {
+                struct netfront_stats *xen_nf_stats;
+                xen_nf_stats = per_cpu_ptr(np->stats, i);
+                u64_stats_init(&xen_nf_stats->syncp);
+        }
+
         /* Initialise tx_skbs as a free chain containing every entry. */
         np->tx_skb_freelist = 0;
         for (i = 0; i < NET_TX_RING_SIZE; i++) {