net: fix race condition in several drivers when reading stats

[karo-tx-linux.git] / net / bridge / br_device.c

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 929e48aed44438bf82565ade96713c0169f5e440..3334845376005cdba3a3b6b2d0b4013da4617446 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -127,9 +127,9 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev,
                const struct br_cpu_netstats *bstats
                        = per_cpu_ptr(br->stats, cpu);
                do {
-                       start = u64_stats_fetch_begin(&bstats->syncp);
+                       start = u64_stats_fetch_begin_bh(&bstats->syncp);
                        memcpy(&tmp, bstats, sizeof(tmp));
-               } while (u64_stats_fetch_retry(&bstats->syncp, start));
+               } while (u64_stats_fetch_retry_bh(&bstats->syncp, start));
                sum.tx_bytes   += tmp.tx_bytes;
                sum.tx_packets += tmp.tx_packets;
                sum.rx_bytes   += tmp.rx_bytes;
@@ -246,10 +246,7 @@ int br_netpoll_enable(struct net_bridge_port *p)
        if (!np)
                goto out;
 
-       np->dev = p->dev;
-       strlcpy(np->dev_name, p->dev->name, IFNAMSIZ);
-
-       err = __netpoll_setup(np);
+       err = __netpoll_setup(np, p->dev);
        if (err) {
                kfree(np);
                goto out;