| Message ID | ebcffc302b5886a71a3e7aaec4561be2d65de30f.1685095619.git.aclaudi@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 33c3776b3ab652a231b36a5aa319874aebad3c59 |
| Delegated to: | Stephen Hemminger |
| Headers | show |
| Series | [iproute2-next] bridge: vni: remove useless checks on vni | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <stephen@networkplumber.org>: On Fri, 26 May 2023 19:27:20 +0200 you wrote: > After the (d == NULL || vni == NULL) check, vni cannot be NULL anymore. > > This remove two useless conditional checks on vni value: > - the first check cannot be true, so remove the whole conditional block > - the second check is always true, so remove the check > > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > > [...] Here is the summary with links: - [iproute2-next] bridge: vni: remove useless checks on vni https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=33c3776b3ab6 You are awesome, thank you!
diff --git a/bridge/vni.c b/bridge/vni.c index 940f251c..77328a4f 100644 --- a/bridge/vni.c +++ b/bridge/vni.c @@ -138,14 +138,8 @@ static int vni_modify(int cmd, int argc, char **argv) return -1; } - if (!vni && group_present) { - fprintf(stderr, "Group can only be specified with a vni\n"); - return -1; - } - - if (vni) - parse_vni_filter(vni, &req.n, sizeof(req), - (group_present ? &daddr : NULL)); + parse_vni_filter(vni, &req.n, sizeof(req), + (group_present ? &daddr : NULL)); req.tmsg.ifindex = ll_name_to_index(d); if (req.tmsg.ifindex == 0) {
After the (d == NULL || vni == NULL) check, vni cannot be NULL anymore. This remove two useless conditional checks on vni value: - the first check cannot be true, so remove the whole conditional block - the second check is always true, so remove the check Signed-off-by: Andrea Claudi <aclaudi@redhat.com> --- bridge/vni.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)