1 From d7e1738f0a0b0573ac93cf570ba3df9dee61b68e Mon Sep 17 00:00:00 2001
2 From: Kevin 'ldir' Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
3 Date: Wed, 18 Dec 2019 14:05:13 +0000
4 Subject: [PATCH 2/2] sch_cake: drop unused variable tin_quantum_prio
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Turns out tin_quantum_prio isn't used anymore and is a leftover from a
10 previous implementation of diffserv tins. Since the variable isn't used
11 in any calculations it can be eliminated.
13 Drop variable and places where it was set. Rename remaining variable
14 and consolidate naming of intermediate variables that set it.
16 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
17 Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
18 Signed-off-by: David S. Miller <davem@davemloft.net>
20 net/sched/sch_cake.c | 59 ++++++++++++++------------------------------
21 1 file changed, 18 insertions(+), 41 deletions(-)
23 --- a/net/sched/sch_cake.c
24 +++ b/net/sched/sch_cake.c
25 @@ -173,8 +173,7 @@ struct cake_tin_data {
29 - u16 tin_quantum_prio;
30 - u16 tin_quantum_band;
35 @@ -1943,7 +1942,7 @@ begin:
36 while (b->tin_deficit < 0 ||
37 !(b->sparse_flow_count + b->bulk_flow_count)) {
38 if (b->tin_deficit <= 0)
39 - b->tin_deficit += b->tin_quantum_band;
40 + b->tin_deficit += b->tin_quantum;
41 if (b->sparse_flow_count + b->bulk_flow_count)
44 @@ -2265,8 +2264,7 @@ static int cake_config_besteffort(struct
46 cake_set_rate(b, rate, mtu,
47 us_to_ns(q->target), us_to_ns(q->interval));
48 - b->tin_quantum_band = 65535;
49 - b->tin_quantum_prio = 65535;
50 + b->tin_quantum = 65535;
54 @@ -2277,8 +2275,7 @@ static int cake_config_precedence(struct
55 struct cake_sched_data *q = qdisc_priv(sch);
56 u32 mtu = psched_mtu(qdisc_dev(sch));
57 u64 rate = q->rate_bps;
64 @@ -2291,18 +2288,14 @@ static int cake_config_precedence(struct
65 cake_set_rate(b, rate, mtu, us_to_ns(q->target),
66 us_to_ns(q->interval));
68 - b->tin_quantum_prio = max_t(u16, 1U, quantum1);
69 - b->tin_quantum_band = max_t(u16, 1U, quantum2);
70 + b->tin_quantum = max_t(u16, 1U, quantum);
72 /* calculate next class's parameters */
86 @@ -2371,8 +2364,7 @@ static int cake_config_diffserv8(struct
87 struct cake_sched_data *q = qdisc_priv(sch);
88 u32 mtu = psched_mtu(qdisc_dev(sch));
89 u64 rate = q->rate_bps;
96 @@ -2388,18 +2380,14 @@ static int cake_config_diffserv8(struct
97 cake_set_rate(b, rate, mtu, us_to_ns(q->target),
98 us_to_ns(q->interval));
100 - b->tin_quantum_prio = max_t(u16, 1U, quantum1);
101 - b->tin_quantum_band = max_t(u16, 1U, quantum2);
102 + b->tin_quantum = max_t(u16, 1U, quantum);
104 /* calculate next class's parameters */
118 @@ -2438,17 +2426,11 @@ static int cake_config_diffserv4(struct
119 cake_set_rate(&q->tins[3], rate >> 2, mtu,
120 us_to_ns(q->target), us_to_ns(q->interval));
122 - /* priority weights */
123 - q->tins[0].tin_quantum_prio = quantum;
124 - q->tins[1].tin_quantum_prio = quantum >> 4;
125 - q->tins[2].tin_quantum_prio = quantum << 2;
126 - q->tins[3].tin_quantum_prio = quantum << 4;
128 /* bandwidth-sharing weights */
129 - q->tins[0].tin_quantum_band = quantum;
130 - q->tins[1].tin_quantum_band = quantum >> 4;
131 - q->tins[2].tin_quantum_band = quantum >> 1;
132 - q->tins[3].tin_quantum_band = quantum >> 2;
133 + q->tins[0].tin_quantum = quantum;
134 + q->tins[1].tin_quantum = quantum >> 4;
135 + q->tins[2].tin_quantum = quantum >> 1;
136 + q->tins[3].tin_quantum = quantum >> 2;
140 @@ -2479,15 +2461,10 @@ static int cake_config_diffserv3(struct
141 cake_set_rate(&q->tins[2], rate >> 2, mtu,
142 us_to_ns(q->target), us_to_ns(q->interval));
144 - /* priority weights */
145 - q->tins[0].tin_quantum_prio = quantum;
146 - q->tins[1].tin_quantum_prio = quantum >> 4;
147 - q->tins[2].tin_quantum_prio = quantum << 4;
149 /* bandwidth-sharing weights */
150 - q->tins[0].tin_quantum_band = quantum;
151 - q->tins[1].tin_quantum_band = quantum >> 4;
152 - q->tins[2].tin_quantum_band = quantum >> 2;
153 + q->tins[0].tin_quantum = quantum;
154 + q->tins[1].tin_quantum = quantum >> 4;
155 + q->tins[2].tin_quantum = quantum >> 2;