aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_generic.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r--net/sched/sch_generic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index de1663f7d3ad..66ba2ce2320f 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -1372,7 +1372,7 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
1372 if (!tp_head) { 1372 if (!tp_head) {
1373 RCU_INIT_POINTER(*miniqp->p_miniq, NULL); 1373 RCU_INIT_POINTER(*miniqp->p_miniq, NULL);
1374 /* Wait for flying RCU callback before it is freed. */ 1374 /* Wait for flying RCU callback before it is freed. */
1375 rcu_barrier_bh(); 1375 rcu_barrier();
1376 return; 1376 return;
1377 } 1377 }
1378 1378
@@ -1380,10 +1380,10 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
1380 &miniqp->miniq1 : &miniqp->miniq2; 1380 &miniqp->miniq1 : &miniqp->miniq2;
1381 1381
1382 /* We need to make sure that readers won't see the miniq 1382 /* We need to make sure that readers won't see the miniq
1383 * we are about to modify. So wait until previous call_rcu_bh callback 1383 * we are about to modify. So wait until previous call_rcu callback
1384 * is done. 1384 * is done.
1385 */ 1385 */
1386 rcu_barrier_bh(); 1386 rcu_barrier();
1387 miniq->filter_list = tp_head; 1387 miniq->filter_list = tp_head;
1388 rcu_assign_pointer(*miniqp->p_miniq, miniq); 1388 rcu_assign_pointer(*miniqp->p_miniq, miniq);
1389 1389
@@ -1392,7 +1392,7 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp,
1392 * block potential new user of miniq_old until all readers 1392 * block potential new user of miniq_old until all readers
1393 * are not seeing it. 1393 * are not seeing it.
1394 */ 1394 */
1395 call_rcu_bh(&miniq_old->rcu, mini_qdisc_rcu_func); 1395 call_rcu(&miniq_old->rcu, mini_qdisc_rcu_func);
1396} 1396}
1397EXPORT_SYMBOL(mini_qdisc_pair_swap); 1397EXPORT_SYMBOL(mini_qdisc_pair_swap);
1398 1398