diff --git a/[refs] b/[refs] index 1db8b4fe96d6..43fab38cf2cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c04ec8063d3a89e5ae933c7b4be04476fe65c6de +refs/heads/master: 36655042f9873efc2a90d251b9aef9b6b79d75d8 diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c index b898364beaf5..f8cb908db81f 100644 --- a/trunk/net/bridge/br_device.c +++ b/trunk/net/bridge/br_device.c @@ -231,7 +231,6 @@ void br_netpoll_cleanup(struct net_device *dev) struct net_bridge_port *p, *n; const struct net_device_ops *ops; - br->dev->npinfo = NULL; list_for_each_entry_safe(p, n, &br->port_list, list) { if (p->dev) { ops = p->dev->netdev_ops;