aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2014-06-26 03:56:31 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-01 17:20:32 -0400
commit9bf2b8c280b5c02ca8a9e75263bf3ca998fed144 (patch)
tree01ac45486bf89161dfa55f543847692a4b21ad40
parentd93331965729850303f6111381c1a4a9e9b8ae5a (diff)
net: fix some typos in comment
In commit 371121057607e3127e19b3fa094330181b5b031e("net: QDISC_STATE_RUNNING dont need atomic bit ops") the __QDISC_STATE_RUNNING is renamed to __QDISC___STATE_RUNNING, but the old names existing in comment are not replaced with the new name completely. Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c4
-rw-r--r--net/sched/sch_generic.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index a04b12f31e18..de9774119541 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2738,8 +2738,8 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
2738 /* 2738 /*
2739 * Heuristic to force contended enqueues to serialize on a 2739 * Heuristic to force contended enqueues to serialize on a
2740 * separate lock before trying to get qdisc main lock. 2740 * separate lock before trying to get qdisc main lock.
2741 * This permits __QDISC_STATE_RUNNING owner to get the lock more often 2741 * This permits __QDISC___STATE_RUNNING owner to get the lock more
2742 * and dequeue packets faster. 2742 * often and dequeue packets faster.
2743 */ 2743 */
2744 contended = qdisc_is_running(q); 2744 contended = qdisc_is_running(q);
2745 if (unlikely(contended)) 2745 if (unlikely(contended))
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 *