diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 5b3042e69f85..e14f1cba591a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1326,7 +1326,7 @@ static int __dev_close_many(struct list_head *head) | |||
1326 | * dev->stop() will invoke napi_disable() on all of it's | 1326 | * dev->stop() will invoke napi_disable() on all of it's |
1327 | * napi_struct instances on this device. | 1327 | * napi_struct instances on this device. |
1328 | */ | 1328 | */ |
1329 | smp_mb__after_clear_bit(); /* Commit netif_running(). */ | 1329 | smp_mb__after_atomic(); /* Commit netif_running(). */ |
1330 | } | 1330 | } |
1331 | 1331 | ||
1332 | dev_deactivate_many(head); | 1332 | dev_deactivate_many(head); |
@@ -3343,7 +3343,7 @@ static void net_tx_action(struct softirq_action *h) | |||
3343 | 3343 | ||
3344 | root_lock = qdisc_lock(q); | 3344 | root_lock = qdisc_lock(q); |
3345 | if (spin_trylock(root_lock)) { | 3345 | if (spin_trylock(root_lock)) { |
3346 | smp_mb__before_clear_bit(); | 3346 | smp_mb__before_atomic(); |
3347 | clear_bit(__QDISC_STATE_SCHED, | 3347 | clear_bit(__QDISC_STATE_SCHED, |
3348 | &q->state); | 3348 | &q->state); |
3349 | qdisc_run(q); | 3349 | qdisc_run(q); |
@@ -3353,7 +3353,7 @@ static void net_tx_action(struct softirq_action *h) | |||
3353 | &q->state)) { | 3353 | &q->state)) { |
3354 | __netif_reschedule(q); | 3354 | __netif_reschedule(q); |
3355 | } else { | 3355 | } else { |
3356 | smp_mb__before_clear_bit(); | 3356 | smp_mb__before_atomic(); |
3357 | clear_bit(__QDISC_STATE_SCHED, | 3357 | clear_bit(__QDISC_STATE_SCHED, |
3358 | &q->state); | 3358 | &q->state); |
3359 | } | 3359 | } |
@@ -4244,7 +4244,7 @@ void __napi_complete(struct napi_struct *n) | |||
4244 | BUG_ON(n->gro_list); | 4244 | BUG_ON(n->gro_list); |
4245 | 4245 | ||
4246 | list_del(&n->poll_list); | 4246 | list_del(&n->poll_list); |
4247 | smp_mb__before_clear_bit(); | 4247 | smp_mb__before_atomic(); |
4248 | clear_bit(NAPI_STATE_SCHED, &n->state); | 4248 | clear_bit(NAPI_STATE_SCHED, &n->state); |
4249 | } | 4249 | } |
4250 | EXPORT_SYMBOL(__napi_complete); | 4250 | EXPORT_SYMBOL(__napi_complete); |