diff options
| author |   Zoltan Kiss <zoltan.kiss@citrix.com> | 2014-08-04 16:20:57 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-08-05 16:04:46 -0700 |
| commit | 3d1af1df9762e56e563e8fd088a1b4ce2bcfaf8b (patch) | |
| tree | 958644b13f317f33877a704060e3dc03d1eac118 /drivers/net/xen-netback/netback.c | |
| parent | Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next (diff) | |
| download | linux-dev-3d1af1df9762e56e563e8fd088a1b4ce2bcfaf8b.tar.xz linux-dev-3d1af1df9762e56e563e8fd088a1b4ce2bcfaf8b.zip | |
xen-netback: Using a new state bit instead of carrier
This patch introduces a new state bit VIF_STATUS_CONNECTED to track whether the
vif is in a connected state. Using carrier will not work with the next patch
in this series, which aims to turn the carrier temporarily off if the guest
doesn't seem to be able to receive packets.
Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xenproject.org
v2:
- rename the bitshift type to "enum state_bit_shift" here, not in the next patch
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 769e553d3f45..6c4cc0f44da5 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1953,7 +1953,7 @@ int xenvif_kthread_guest_rx(void *data) * context so we defer it here, if this thread is * associated with queue 0. */ - if (unlikely(queue->vif->disabled && netif_carrier_ok(queue->vif->dev) && queue->id == 0)) + if (unlikely(queue->vif->disabled && queue->id == 0)) xenvif_carrier_off(queue->vif); if (kthread_should_stop()) |