matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipaddress: do not add IFA_FLAGS when not necessary 

commit 37c9b94ed2 (add support for extended ifa_flags)
introduced a regression:

        # ./ip/ip addr add 192.168.0.1/24 dev eth0
        RTNETLINK answers: Invalid argument

This is due to old kernels don't support IFA_FLAGS flag, we should not
use it if we don't use the flags beyond old .ifa_flags.

Cc: Jiri Pirko <jiri@resnulli.us>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
This commit is contained in:
WANG Cong 2014-04-04 10:07:20 -07:00 committed by Stephen Hemminger
parent 1891754487
commit 8b21f88dd0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ip/ipaddress.c
View File

@ -1398,8 +1398,10 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
} }
argc--; argv++; argc--; argv++;
} }
req.ifa.ifa_flags = ifa_flags; if (ifa_flags <= 0xff)
addattr32(&req.n, sizeof(req), IFA_FLAGS, ifa_flags); req.ifa.ifa_flags = ifa_flags;
else
addattr32(&req.n, sizeof(req), IFA_FLAGS, ifa_flags);
if (d == NULL) { if (d == NULL) {
fprintf(stderr, "Not enough information: \"dev\" argument is required.\n"); fprintf(stderr, "Not enough information: \"dev\" argument is required.\n");