From: David S. Miller <davem@davemloft.net>
Date: Tue, 5 Aug 2014 23:04:55 +0000 (-0700)
Subject: Merge branch 'xen-netback-next'
X-Git-Tag: v3.17-rc1~106^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=61675fea33350d2d9b3b5f64b498dc88ee59c695;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'xen-netback-next'

Zoltan Kiss says:

====================
xen-netback: Changes around carrier handling

This series starts using carrier off as a way to purge packets when the guest is
not able (or willing) to receive them. It is a much faster way to get rid of
packets waiting for an overwhelmed guest.
The first patch changes current netback code where it relies currently on
netif_carrier_ok.
The second turns off the carrier if the guest times out on a queue, and only
turn it on again if that queue (or queues) resurrects.
====================

Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

61675fea33350d2d9b3b5f64b498dc88ee59c695