| Message ID | 20170607132313.5290-1-jkbs@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Wed, 7 Jun 2017 15:23:13 +0200 Jakub Sitnicki <jkbs@redhat.com> wrote: > When modifying a route we set the RTA_OIF attribute only if a device was > specified with "dev" or "oif" keyword. But for some unknown reason we > earlier alternatively check also for the presence of "nexthop" keyword, > even though it has no effect. So remove the pointless check. > > Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> Makes sense, applied.
diff --git a/ip/iproute.c b/ip/iproute.c index b4ca291..4fd36a1 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -1241,16 +1241,14 @@ static int iproute_modify(int cmd, unsigned int flags, int argc, char **argv) if (!dst_ok) usage(); - if (d || nhs_ok) { + if (d) { int idx; - if (d) { - if ((idx = ll_name_to_index(d)) == 0) { - fprintf(stderr, "Cannot find device \"%s\"\n", d); - return -1; - } - addattr32(&req.n, sizeof(req), RTA_OIF, idx); + if ((idx = ll_name_to_index(d)) == 0) { + fprintf(stderr, "Cannot find device \"%s\"\n", d); + return -1; } + addattr32(&req.n, sizeof(req), RTA_OIF, idx); } if (mxrta->rta_len > RTA_LENGTH(0)) {
When modifying a route we set the RTA_OIF attribute only if a device was specified with "dev" or "oif" keyword. But for some unknown reason we earlier alternatively check also for the presence of "nexthop" keyword, even though it has no effect. So remove the pointless check. Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> --- ip/iproute.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)