Merge branch 'master' of git://1984.lsi.us.es/nf-next

[~andy/linux] / drivers / net / veth.c

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 0f71a4fe506a8a223e8d3fe38b7d2b8ef490e724..07a4af0aa3dcda800a9527e3ba01d9f65ea3feec 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -206,9 +206,11 @@ static int veth_open(struct net_device *dev)
 static int veth_close(struct net_device *dev)
 {
        struct veth_priv *priv = netdev_priv(dev);
+       struct net_device *peer = rtnl_dereference(priv->peer);
 
        netif_carrier_off(dev);
-       netif_carrier_off(rtnl_dereference(priv->peer));
+       if (peer)
+               netif_carrier_off(peer);
 
        return 0;
 }
@@ -424,12 +426,13 @@ static void veth_dellink(struct net_device *dev, struct list_head *head)
         * not being freed before one RCU grace period.
         */
        RCU_INIT_POINTER(priv->peer, NULL);
-
-       priv = netdev_priv(peer);
-       RCU_INIT_POINTER(priv->peer, NULL);
-
        unregister_netdevice_queue(dev, head);
-       unregister_netdevice_queue(peer, head);
+
+       if (peer) {
+               priv = netdev_priv(peer);
+               RCU_INIT_POINTER(priv->peer, NULL);
+               unregister_netdevice_queue(peer, head);
+       }
 }
 
 static const struct nla_policy veth_policy[VETH_INFO_MAX + 1] = {