aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-06-10 16:12:43 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-15 10:58:38 -0700
commit36655042f9873efc2a90d251b9aef9b6b79d75d8 (patch)
treea659ea763ee546fc695456581de4a0b1ba17bb0b /net
parentnetpoll: Set npinfo to NULL even with ndo_netpoll_cleanup (diff)
downloadlinux-dev-36655042f9873efc2a90d251b9aef9b6b79d75d8.tar.xz
linux-dev-36655042f9873efc2a90d251b9aef9b6b79d75d8.zip
bridge: Remove redundant npinfo NULL setting
Now that netpoll always zaps npinfo we no longer need to do it in bridge. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_device.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index b898364beaf5..f8cb908db81f 100644
--- a/net/bridge/br_device.c
+++ b/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;