diff options
author | Stephen Hemminger <shemming@brocade.com> | 2015-10-18 21:58:29 -0700 |
---|---|---|
committer | Stephen Hemminger <shemming@brocade.com> | 2015-10-18 21:58:29 -0700 |
commit | b89c359c15b7b20f153813aabfc62071bc6f94a8 (patch) | |
tree | a97074d4f18fc87cd6d6a49072709e7ea2583644 | |
parent | 70e4663472017b627affccbea1570d7ca7736f1c (diff) | |
parent | 8b21cef12943cab841ba9adabb8ce2360b04c65e (diff) | |
download | android_external_iproute2-b89c359c15b7b20f153813aabfc62071bc6f94a8.tar.gz android_external_iproute2-b89c359c15b7b20f153813aabfc62071bc6f94a8.tar.bz2 android_external_iproute2-b89c359c15b7b20f153813aabfc62071bc6f94a8.zip |
Merge branch 'master' into net-next
-rw-r--r-- | bridge/fdb.c | 2 | ||||
-rw-r--r-- | bridge/mdb.c | 2 | ||||
-rw-r--r-- | ip/iproute.c | 2 | ||||
-rw-r--r-- | ip/iprule.c | 1 | ||||
-rw-r--r-- | man/man8/ip-rule.8 | 2 | ||||
-rw-r--r-- | misc/ss.c | 2 |
6 files changed, 7 insertions, 4 deletions
diff --git a/bridge/fdb.c b/bridge/fdb.c index bd7e4f9..5ea50ab 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -163,6 +163,8 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) fprintf(fp, "offload "); fprintf(fp, "%s\n", state_n2a(r->ndm_state)); + fflush(fp); + return 0; } diff --git a/bridge/mdb.c b/bridge/mdb.c index b14bd01..24c4903 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -135,6 +135,8 @@ int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) } } + fflush(fp); + return 0; } diff --git a/ip/iproute.c b/ip/iproute.c index ce90895..8e4022b 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -1674,7 +1674,7 @@ static int iproute_get(int argc, char **argv) req.r.rtm_flags |= RTM_F_LOOKUP_TABLE; if (rtnl_talk(&rth, &req.n, &req.n, sizeof(req)) < 0) - exit(2); + return -2; if (connected && !from_ok) { struct rtmsg *r = NLMSG_DATA(&req.n); diff --git a/ip/iprule.c b/ip/iprule.c index 714278a..2fa9ade 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -36,7 +36,6 @@ static void usage(void) fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n"); fprintf(stderr, " [ iif STRING ] [ oif STRING ] [ pref NUMBER ]\n"); fprintf(stderr, "ACTION := [ table TABLE_ID ]\n"); - fprintf(stderr, " [ prohibit | reject | unreachable ]\n"); fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n"); fprintf(stderr, " [ goto NUMBER ]\n"); fprintf(stderr, " SUPPRESSOR\n"); diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8 index dd925be..6245d8c 100644 --- a/man/man8/ip-rule.8 +++ b/man/man8/ip-rule.8 @@ -41,7 +41,7 @@ ip-rule \- routing policy database management .IR TABLE_ID " ] [ " .B nat .IR ADDRESS " ] [ " -.BR prohibit " | " reject " | " unreachable " ] [ " realms +.B realms .RI "[" SRCREALM "/]" DSTREALM " ]" .I SUPPRESSOR @@ -3770,8 +3770,8 @@ int main(int argc, char *argv[]) exit(1); break; case 'h': - case '?': help(); + case '?': default: usage(); } |