| Message ID | a98f8ff492c5be9f06a6ad6522371230c5721ee7.1619887263.git.aclaudi@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [iproute2] tc: q_ets: drop dead code from argument parsing | expand |
On 5/1/21 10:44 AM, Andrea Claudi wrote: > Checking for nbands to be at least 1 at this point is useless. Indeed: > - ets requires "bands", "quanta" or "strict" to be specified > - if "bands" is specified, nbands cannot be negative, see parse_nbands() > - if "strict" is specified, nstrict cannot be negative, see > parse_nbands() > - if "quantum" is specified, nquanta cannot be negative, see > parse_quantum() > - if "bands" is not specified, nbands is set to nstrict+nquanta > - the previous if statement takes care of the case when none of them are > specified and nbands is 0, terminating execution. > > Thus nbands cannot be < 1 at this point and this code cannot be executed. > > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > --- > tc/q_ets.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/tc/q_ets.c b/tc/q_ets.c > index e7903d50..7380bb2f 100644 > --- a/tc/q_ets.c > +++ b/tc/q_ets.c > @@ -147,11 +147,6 @@ parse_priomap: > explain(); > return -1; > } > - if (nbands < 1) { > - fprintf(stderr, "The number of \"bands\" must be >= 1\n"); > - explain(); > - return -1; > - } > if (nstrict + nquanta > nbands) { > fprintf(stderr, "Not enough total bands to cover all the strict bands and quanta\n"); > explain(); > applied
Hello: This patch was applied to iproute2/iproute2-next.git (refs/heads/main): On Sat, 1 May 2021 18:44:35 +0200 you wrote: > Checking for nbands to be at least 1 at this point is useless. Indeed: > - ets requires "bands", "quanta" or "strict" to be specified > - if "bands" is specified, nbands cannot be negative, see parse_nbands() > - if "strict" is specified, nstrict cannot be negative, see > parse_nbands() > - if "quantum" is specified, nquanta cannot be negative, see > parse_quantum() > - if "bands" is not specified, nbands is set to nstrict+nquanta > - the previous if statement takes care of the case when none of them are > specified and nbands is 0, terminating execution. > > [...] Here is the summary with links: - [iproute2] tc: q_ets: drop dead code from argument parsing https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=a2f1f66075c8 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tc/q_ets.c b/tc/q_ets.c index e7903d50..7380bb2f 100644 --- a/tc/q_ets.c +++ b/tc/q_ets.c @@ -147,11 +147,6 @@ parse_priomap: explain(); return -1; } - if (nbands < 1) { - fprintf(stderr, "The number of \"bands\" must be >= 1\n"); - explain(); - return -1; - } if (nstrict + nquanta > nbands) { fprintf(stderr, "Not enough total bands to cover all the strict bands and quanta\n"); explain();
Checking for nbands to be at least 1 at this point is useless. Indeed: - ets requires "bands", "quanta" or "strict" to be specified - if "bands" is specified, nbands cannot be negative, see parse_nbands() - if "strict" is specified, nstrict cannot be negative, see parse_nbands() - if "quantum" is specified, nquanta cannot be negative, see parse_quantum() - if "bands" is not specified, nbands is set to nstrict+nquanta - the previous if statement takes care of the case when none of them are specified and nbands is 0, terminating execution. Thus nbands cannot be < 1 at this point and this code cannot be executed. Signed-off-by: Andrea Claudi <aclaudi@redhat.com> --- tc/q_ets.c | 5 ----- 1 file changed, 5 deletions(-)