diff --git a/[refs] b/[refs] index 1ceb7e5b129b..518b270d117d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f1e4958069c6e7ff3f8b73148d14c08d015f0bf +refs/heads/master: 2efd32ee1b60b0b31404ca47c1ce70e5a5d24ebc diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c index 0f71a4fe506a..e1da42aaf9de 100644 --- a/trunk/drivers/net/veth.c +++ b/trunk/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; }