bridge: fdb: add support for src_vni option

[mirror_iproute2.git] / tc / tc_stab.c

diff --git a/tc/tc_stab.c b/tc/tc_stab.c
index a8404f8eb636343b0498a01291175f05b2875782..c0f1f160d56ed38b88b2d83df1da65766c055ac1 100644 (file)
--- a/tc/tc_stab.c
+++ b/tc/tc_stab.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <math.h>
 #include <sys/socket.h>
@@ -31,7 +30,7 @@
 static void stab_help(void)
 {
        fprintf(stderr,
-               "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n"
+               "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ]\n"
                "                [ overhead BYTES ] [ linklayer TYPE ] ...\n"
                "   mtu       : max packet size we create rate map for {2047}\n"
                "   tsize     : how many slots should size table have {512}\n"
@@ -40,7 +39,6 @@ static void stab_help(void)
                "   linklayer : adapting to a linklayer e.g. atm\n"
                "Example: ... stab overhead 20 linklayer atm\n");
 
-       return;
 }
 
 int check_size_table_opts(struct tc_sizespec *s)
@@ -53,9 +51,7 @@ int parse_size_table(int *argcp, char ***argvp, struct tc_sizespec *sp)
 {
        char **argv = *argvp;
        int argc = *argcp;
-       struct tc_sizespec s;
-
-       memset(&s, 0, sizeof(s));
+       struct tc_sizespec s = {};
 
        NEXT_ARG();
        if (matches(*argv, "help") == 0) {
@@ -67,42 +63,32 @@ int parse_size_table(int *argcp, char ***argvp, struct tc_sizespec *sp)
                        NEXT_ARG();
                        if (s.mtu)
                                duparg("mtu", *argv);
-                       if (get_u32(&s.mtu, *argv, 10)) {
+                       if (get_u32(&s.mtu, *argv, 10))
                                invarg("mtu", "invalid mtu");
-                               return -1;
-                       }
                } else if (matches(*argv, "mpu") == 0) {
                        NEXT_ARG();
                        if (s.mpu)
                                duparg("mpu", *argv);
-                       if (get_u32(&s.mpu, *argv, 10)) {
+                       if (get_u32(&s.mpu, *argv, 10))
                                invarg("mpu", "invalid mpu");
-                               return -1;
-                       }
                } else if (matches(*argv, "overhead") == 0) {
                        NEXT_ARG();
                        if (s.overhead)
                                duparg("overhead", *argv);
-                       if (get_integer(&s.overhead, *argv, 10)) {
+                       if (get_integer(&s.overhead, *argv, 10))
                                invarg("overhead", "invalid overhead");
-                               return -1;
-                       }
                } else if (matches(*argv, "tsize") == 0) {
                        NEXT_ARG();
                        if (s.tsize)
                                duparg("tsize", *argv);
-                       if (get_u32(&s.tsize, *argv, 10)) {
+                       if (get_u32(&s.tsize, *argv, 10))
                                invarg("tsize", "invalid table size");
-                               return -1;
-                       }
                } else if (matches(*argv, "linklayer") == 0) {
                        NEXT_ARG();
                        if (s.linklayer != LINKLAYER_UNSPEC)
                                duparg("linklayer", *argv);
-                       if (get_linklayer(&s.linklayer, *argv)) {
+                       if (get_linklayer(&s.linklayer, *argv))
                                invarg("linklayer", "invalid linklayer");
-                               return -1;
-                       }
                } else
                        break;
                argc--; argv++;
@@ -120,12 +106,14 @@ int parse_size_table(int *argcp, char ***argvp, struct tc_sizespec *sp)
 void print_size_table(FILE *fp, const char *prefix, struct rtattr *rta)
 {
        struct rtattr *tb[TCA_STAB_MAX + 1];
+
        SPRINT_BUF(b1);
 
        parse_rtattr_nested(tb, TCA_STAB_MAX, rta);
 
        if (tb[TCA_STAB_BASE]) {
                struct tc_sizespec s = {0};
+
                memcpy(&s, RTA_DATA(tb[TCA_STAB_BASE]),
                                MIN(RTA_PAYLOAD(tb[TCA_STAB_BASE]), sizeof(s)));
 
@@ -145,8 +133,9 @@ void print_size_table(FILE *fp, const char *prefix, struct rtattr *rta)
 
 #if 0
        if (tb[TCA_STAB_DATA]) {
-               unsigned i, j, dlen;
+               unsigned int i, j, dlen;
                __u16 *data = RTA_DATA(tb[TCA_STAB_DATA]);
+
                dlen = RTA_PAYLOAD(tb[TCA_STAB_DATA]) / sizeof(__u16);
 
                fprintf(fp, "\n%sstab data:", prefix);
@@ -158,4 +147,3 @@ void print_size_table(FILE *fp, const char *prefix, struct rtattr *rta)
        }
 #endif
 }
-