Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bf2b8c2 authored Jun 26, 2014 by Ying Xue Committed by David S. Miller Jul 01, 2014

net: fix some typos in comment



In commit 37112105("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>

parent d9333196

net/core/dev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2738,8 +2738,8 @@ static inline int __dev_xmit_skb(struct sk_buff skb, struct Qdisc q,
		/*
		* Heuristic to force contended enqueues to serialize on a
		* separate lock before trying to get qdisc main lock.
		* This permits __QDISC_STATE_RUNNING owner to get the lock more often
		* and dequeue packets faster.
		* This permits __QDISC___STATE_RUNNING owner to get the lock more
		* often and dequeue packets faster.
		*/
		contended = qdisc_is_running(q);
		if (unlikely(contended))

net/sched/sch_generic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,

		/*
		* Transmit one skb, and handle the return status as required. Holding the
		* __QDISC_STATE_RUNNING bit guarantees that only one CPU can execute this
		* __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this
		* function.
		*
		* Returns to the caller:
		@@ -156,7 +156,7 @@ int sch_direct_xmit(struct sk_buff skb, struct Qdisc q,
		/*
		* NOTE: Called under qdisc_lock(q) with locally disabled BH.
		*
		* __QDISC_STATE_RUNNING guarantees only one CPU can process
		* __QDISC___STATE_RUNNING guarantees only one CPU can process
		* this qdisc at a time. qdisc_lock(q) serializes queue accesses for
		* this queue.
		*