Merge commit '3cf2f34' into sched/core, to fix build error

[linux-2.6-block.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index d2c8a06b3a9883b618c55a8cddf0929a4bcd049f..5f895956ba3db3efc0c0200cef2e4627e7dffc53 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1326,7 +1326,7 @@ static int __dev_close_many(struct list_head *head)
                 * dev->stop() will invoke napi_disable() on all of it's
                 * napi_struct instances on this device.
                 */
-               smp_mb__after_clear_bit(); /* Commit netif_running(). */
+               smp_mb__after_atomic(); /* Commit netif_running(). */
        }
 
        dev_deactivate_many(head);
@@ -3343,7 +3343,7 @@ static void net_tx_action(struct softirq_action *h)
 
                        root_lock = qdisc_lock(q);
                        if (spin_trylock(root_lock)) {
-                               smp_mb__before_clear_bit();
+                               smp_mb__before_atomic();
                                clear_bit(__QDISC_STATE_SCHED,
                                          &q->state);
                                qdisc_run(q);
@@ -3353,7 +3353,7 @@ static void net_tx_action(struct softirq_action *h)
                                              &q->state)) {
                                        __netif_reschedule(q);
                                } else {
-                                       smp_mb__before_clear_bit();
+                                       smp_mb__before_atomic();
                                        clear_bit(__QDISC_STATE_SCHED,
                                                  &q->state);
                                }
@@ -4244,7 +4244,7 @@ void __napi_complete(struct napi_struct *n)
        BUG_ON(n->gro_list);
 
        list_del(&n->poll_list);
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit(NAPI_STATE_SCHED, &n->state);
 }
 EXPORT_SYMBOL(__napi_complete);