[PATCH 1/2] net, rps: fix the comment of net_rps_action_and_irq_enable()

[PATCH 1/2] net, rps: fix the comment of net_rps_action_and_irq_enable()

[Zhi Yong Wu]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 net/core/dev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index 973c236..cc9ab80 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4030,7 +4030,7 @@ gro_result_t napi_gro_frags(struct napi_struct *napi)
 EXPORT_SYMBOL(napi_gro_frags);
 
 /*
- * net_rps_action sends any pending IPI's for rps.
+ * net_rps_action_and_irq_enable sends any pending IPI's for rps.
  * Note: called with local irq disabled, but exits with local irq enabled.
  */
 static void net_rps_action_and_irq_enable(struct softnet_data *sd)
-- 
1.7.6.5

[PATCH 2/2] net, sch: fix the typo in register_qdisc()

[Zhi Yong Wu]

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 net/sched/sch_api.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index c31190e..1313145 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -135,7 +135,7 @@ static DEFINE_RWLOCK(qdisc_mod_lock);
 
 static struct Qdisc_ops *qdisc_base;
 
-/* Register/uregister queueing discipline */
+/* Register/unregister queueing discipline */
 
 int register_qdisc(struct Qdisc_ops *qops)
 {
-- 
1.7.6.5

Re: [PATCH 1/2] net, rps: fix the comment of net_rps_action_and_irq_enable()

[David Miller]

From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Wed,  1 Jan 2014 04:34:50 +0800

> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> 
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Applied to net-next

Re: [PATCH 2/2] net, sch: fix the typo in register_qdisc()

[David Miller]

From: Zhi Yong Wu <zwu.kernel@gmail.com>
Date: Wed,  1 Jan 2014 04:34:51 +0800

> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> 
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

Also applied to net-next, thanks.