On 10/1/15 4:21 PM, Cong Wang wrote:
This fixes:
tried to remove device ip6gre0 from (null)
...
Fixes: 93a7e7e837af ("net: Remove the now unused vrf_ptr")
Cc: David Ahern <d...@cumulusnetworks.com>
Signed-off-by: Cong Wang <xiyou.wangc...@gmail.com>
---
drivers/net/vrf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 64f2ab6..4743963 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -672,7 +672,7 @@ static int vrf_device_event(struct notifier_block *unused,
if (event == NETDEV_UNREGISTER) {
struct net_device *vrf_dev;
- if (netif_is_l3_master(dev))
+ if (!vrf_is_slave(dev) || netif_is_l3_master(dev))
goto out;
vrf_dev = netdev_master_upper_dev_get(dev);
Acked-by: David Ahern <d...@cumulusnetworks.com>
Thanks for the fix.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
