summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-10-30 01:00:27 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-30 01:00:27 -0700
commit24540535d33f72505807be3e7ef2e94f3726f971 (patch)
tree8b321c52a8bd4665972fb93673492e83aa9c7df6
parent29906f6a427d2004a515ebbcdc7b28bae8f6c19c (diff)
downloadop-kernel-dev-24540535d33f72505807be3e7ef2e94f3726f971.zip
op-kernel-dev-24540535d33f72505807be3e7ef2e94f3726f971.tar.gz
veth: Fix veth_dellink method
In commit 23289a37e2b127dfc4de1313fba15bb4c9f0cd5b (net: add a list_head parameter to dellink() method), I forgot to actually use this parameter in veth_dellink. I remember feeling a bit uncomfortable about veth_close(), because it does : netif_carrier_off(dev); netif_carrier_off(priv->peer); Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/veth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index ffb502d..9bed694cd 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -450,8 +450,8 @@ static void veth_dellink(struct net_device *dev, struct list_head *head)
priv = netdev_priv(dev);
peer = priv->peer;
- unregister_netdevice(dev);
- unregister_netdevice(peer);
+ unregister_netdevice_queue(dev, head);
+ unregister_netdevice_queue(peer, head);
}
static const struct nla_policy veth_policy[VETH_INFO_MAX + 1];
OpenPOWER on IntegriCloud