summaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netback
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-02-19 13:04:34 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-19 13:04:34 -0500
commit629821d9b05254063df774594cfe15c0343b73f2 (patch)
tree8caf20c7098ad97a004d1298848077713b832e8b /drivers/net/xen-netback
parent900ff8c6321418dafa03c22e215cb9646a2541b9 (diff)
downloadop-kernel-dev-629821d9b05254063df774594cfe15c0343b73f2.zip
op-kernel-dev-629821d9b05254063df774594cfe15c0343b73f2.tar.gz
Revert "xen: netback: remove redundant xenvif_put"
This reverts commit d37204566a61d5116d385ae909db8e14a734b30f. This change is incorrect, as per Jan Beulich: ==================== But this is wrong from all we can tell, we discussed this before (Wei pointed to the discussion in an earlier reply). The core of it is that the put here parallels the one in netbk_tx_err(), and the one in xenvif_carrier_off() matches the get from xenvif_connect() (which normally would be done on the path coming through xenvif_disconnect()). ==================== And a previous discussion of this issue is at: http://marc.info/?l=xen-devel&m=136084174026977&w=2 Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback')
-rw-r--r--drivers/net/xen-netback/netback.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 28543d6..cd49ba9 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -893,6 +893,7 @@ static void netbk_fatal_tx_err(struct xenvif *vif)
{
netdev_err(vif->dev, "fatal error; disabling device\n");
xenvif_carrier_off(vif);
+ xenvif_put(vif);
}
static int netbk_count_requests(struct xenvif *vif,
OpenPOWER on IntegriCloud