diff options
| author | David S. Miller | 2013-02-19 05:32:49 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-02-19 05:34:21 +0100 |
| commit | 6338a53a2bd02d5878ab449371323364b7cc7694 (patch) | |
| tree | 461c4acae130771b9856715bc2cfdc341b6e5964 /drivers/net/xen-netback/interface.c | |
| parent | ipv6: fix a sparse warning (diff) | |
| parent | xfrm: release neighbor upon dst destruction (diff) | |
| download | kernel-qcow2-linux-6338a53a2bd02d5878ab449371323364b7cc7694.tar.gz kernel-qcow2-linux-6338a53a2bd02d5878ab449371323364b7cc7694.tar.xz kernel-qcow2-linux-6338a53a2bd02d5878ab449371323364b7cc7694.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
Pull in 'net' to take in the bug fixes that didn't make it into
3.8-final.
Also, deal with the semantic conflict of the change made to
net/ipv6/xfrm6_policy.c A missing rt6->n neighbour release
was added to 'net', but in 'net-next' we no longer cache the
neighbour entries in the ipv6 routes so that change is not
appropriate there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index fc1b8d78f4bc..d98414168485 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vif) static void xenvif_down(struct xenvif *vif) { disable_irq(vif->irq); + del_timer_sync(&vif->credit_timeout); xen_netbk_deschedule_xenvif(vif); xen_netbk_remove_xenvif(vif); } @@ -365,8 +366,6 @@ void xenvif_disconnect(struct xenvif *vif) atomic_dec(&vif->refcnt); wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0); - del_timer_sync(&vif->credit_timeout); - if (vif->irq) unbind_from_irqhandler(vif->irq, vif); |