2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index c955fc39d69a..4c76bcb9a879 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -143,6 +143,7 @@ struct xenvif {
         char rx_irq_name[IFNAMSIZ+4]; /* DEVNAME-rx */
         struct xen_netif_rx_back_ring rx;
         struct sk_buff_head rx_queue;
+        bool rx_queue_stopped;
         /* Set when the RX interrupt is triggered by the frontend.
          * The worker thread may need to wake the queue.
          */
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 4f81ac0e2f0a..27385639b6e5 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -476,7 +476,8 @@ static void xenvif_rx_action(struct xenvif *vif)
         int ret;
         unsigned long offset;
         struct skb_cb_overlay *sco;
-        int need_to_notify = 0;
+        bool need_to_notify = false;
+        bool ring_full = false;
 
         struct netrx_pending_operations npo = {
                 .copy  = vif->grant_copy_op,
@@ -508,7 +509,8 @@ static void xenvif_rx_action(struct xenvif *vif)
                 /* If the skb may not fit then bail out now */
                 if (!xenvif_rx_ring_slots_available(vif, max_slots_needed)) {
                         skb_queue_head(&vif->rx_queue, skb);
-                        need_to_notify = 1;
+                        need_to_notify = true;
+                        ring_full = true;
                         break;
                 }
 
@@ -521,6 +523,8 @@ static void xenvif_rx_action(struct xenvif *vif)
 
         BUG_ON(npo.meta_prod > ARRAY_SIZE(vif->meta));
 
+        vif->rx_queue_stopped = !npo.copy_prod && ring_full;
+
         if (!npo.copy_prod)
                 goto done;
 
@@ -592,8 +596,7 @@ static void xenvif_rx_action(struct xenvif *vif)
 
                 RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->rx, ret);
 
-                if (ret)
-                        need_to_notify = 1;
+                need_to_notify |= !!ret;
 
                 npo.meta_cons += sco->meta_slots_used;
                 dev_kfree_skb(skb);
@@ -1724,7 +1727,8 @@ static struct xen_netif_rx_response *make_rx_response(struct xenvif *vif,
 
 static inline int rx_work_todo(struct xenvif *vif)
 {
-        return !skb_queue_empty(&vif->rx_queue) || vif->rx_event;
+        return (!skb_queue_empty(&vif->rx_queue) && !vif->rx_queue_stopped) ||
+                vif->rx_event;
 }
 
 static inline int tx_work_todo(struct xenvif *vif)