diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/sched/sch_generic.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index e1543b03e39d..fc04fe93c2da 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -108,7 +108,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, | |||
| 108 | 108 | ||
| 109 | /* | 109 | /* |
| 110 | * Transmit one skb, and handle the return status as required. Holding the | 110 | * Transmit one skb, and handle the return status as required. Holding the |
| 111 | * __QDISC_STATE_RUNNING bit guarantees that only one CPU can execute this | 111 | * __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this |
| 112 | * function. | 112 | * function. |
| 113 | * | 113 | * |
| 114 | * Returns to the caller: | 114 | * Returns to the caller: |
| @@ -156,7 +156,7 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q, | |||
| 156 | /* | 156 | /* |
| 157 | * NOTE: Called under qdisc_lock(q) with locally disabled BH. | 157 | * NOTE: Called under qdisc_lock(q) with locally disabled BH. |
| 158 | * | 158 | * |
| 159 | * __QDISC_STATE_RUNNING guarantees only one CPU can process | 159 | * __QDISC___STATE_RUNNING guarantees only one CPU can process |
| 160 | * this qdisc at a time. qdisc_lock(q) serializes queue accesses for | 160 | * this qdisc at a time. qdisc_lock(q) serializes queue accesses for |
| 161 | * this queue. | 161 | * this queue. |
| 162 | * | 162 | * |