[PATCH] xen-netback: Small fixes around internal queue purging
From: Zoltan Kiss <hidden>
Date: 2014-08-06 18:16:57
Also in:
lkml
Subsystem:
networking drivers, the rest, xen network backend driver · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Wei Liu, Paul Durrant
This patch adds an extra internal queue purging for xenvif_carrier_off. It makes sense to do this when the carrier is switched off. Also, it uses the proper helper instead of a while loop to the purging at another place. Signed-off-by: Zoltan Kiss <redacted> Signed-off-by: David Vrabel <redacted> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: xen-devel@lists.xenproject.org
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index cbe6b51..df9507e 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c@@ -533,6 +533,9 @@ void xenvif_carrier_off(struct xenvif *vif) } rtnl_unlock(); + + skb_queue_purge(&vif->rx_queue); + vif->rx_last_skb_slots = 0; } void xenvif_disconnect(struct xenvif *vif)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index e462cf2c..f728f73 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c@@ -1932,7 +1932,6 @@ static void xenvif_start_queue(struct xenvif *vif) int xenvif_kthread_guest_rx(void *data) { struct xenvif *vif = data; - struct sk_buff *skb; while (!kthread_should_stop()) { wait_event_interruptible(vif->wq,
@@ -2009,8 +2008,7 @@ int xenvif_kthread_guest_rx(void *data) } /* Bin any remaining skbs */ - while ((skb = skb_dequeue(&vif->rx_queue)) != NULL) - dev_kfree_skb(skb); + skb_queue_purge(&vif->rx_queue); return 0; }