From ba9707912c4731de3ca850e3ad09f465c6e33c65 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 8 May 2008 01:13:31 -0700 Subject: [PATCH] --- yaml --- r: 96195 b: refs/heads/master c: 7312096454b6cd71267eaa3d0efb408e449e9ff3 h: refs/heads/master i: 96193: d62c42798573ca9bd25a2a5002952b4dedc05a64 96191: 95ef6ed8968a22e6340afe0b03820d796d342def v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 831302eec033..02e6a061339e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c67fa02799bccca3d2e16582493da6d57812ec01 +refs/heads/master: 7312096454b6cd71267eaa3d0efb408e449e9ff3 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index 2056cfc624dc..c36a03ae9bfb 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/drivers/net/macvlan.c @@ -450,7 +450,7 @@ static void macvlan_dellink(struct net_device *dev) unregister_netdevice(dev); if (list_empty(&port->vlans)) - macvlan_port_destroy(dev); + macvlan_port_destroy(port->dev); } static struct rtnl_link_ops macvlan_link_ops __read_mostly = {