PKT_SCHED: Rename TCQ_F_INGRES to TCQ_F_INGRESS
Subsystems (3)
PATCH 1/1 PKT_SCHED: Rename TCQ_F_INGRES to TCQ_F_INGRESS
Signed-off-by Thomas Graf <[email protected]>
include/net/pkt_sched.h +1 -1
@@ -78,7 +78,7 @@unsigned flags;#define TCQ_F_BUILTIN 1#define TCQ_F_THROTTLED 2 -#define TCQ_F_INGRES 4 +#define TCQ_F_INGRESS 4struct Qdisc_ops *ops;u32 handle;u32 parent;
net/sched/sch_api.c +3 -3
@@ -307,7 +307,7 @@write_lock (&qdisc_tree_lock);spin_lock_bh (&dev->queue_lock); -if (qdisc && qdisc->flags&TCQ_F_INGRES ) { +if (qdisc && qdisc->flags&TCQ_F_INGRESS ) { oqdisc = dev->qdisc_ingress;/* Prune old scheduler */ if (oqdisc &&atomic_read (&oqdisc->refcnt) <=1 ) {
@@ -357,7 +357,7 @@if (parent ==NULL ) { -if (q && q->flags&TCQ_F_INGRES ) { +if (q && q->flags&TCQ_F_INGRESS ) { *old =dev_graft_qdisc (dev, q); }else { *old =dev_graft_qdisc (dev, new);
@@ -431,7 +431,7 @@skb_queue_head_init (&sch->q);if (handle ==TC_H_INGRESS ) - sch->flags |=TCQ_F_INGRES ; + sch->flags |=TCQ_F_INGRESS ; sch->ops = ops; sch->enqueue = ops->enqueue;
David S. Miller
maintainerBoth 2.4.x and 2.6.x variants applied, thanks Thomas.
Speaking of grep'ability, I will always apply patches that make structure members easier to grep for in the kernel sources. One great example is when Arnaldo added the "sk_*" prefix to the names of the members of struct sock.