bridge: add parse_stp_state helper

Add a helper which parses an STP state string to its numeric value.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/bridge/br_common.h b/bridge/br_common.h
index e3f46765ab89b61322c0171e25e64c98d62803ec..33e56452702b1357a6a5816e1f5255136d85e649 100644 (file)
--- a/bridge/br_common.h
+++ b/bridge/br_common.h
@@ -11,6 +11,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg);
 int print_mdb_mon(struct nlmsghdr *n, void *arg);
 int print_fdb(struct nlmsghdr *n, void *arg);
 void print_stp_state(__u8 state);
+int parse_stp_state(const char *arg);
 
 int do_fdb(int argc, char **argv);
 int do_mdb(int argc, char **argv);

diff --git a/bridge/link.c b/bridge/link.c
index a8cfa1814986bbbacc377c0fad883fc5f3198cae..205a2fe79c1a8c099c5789cc34d5897858b7932a 100644 (file)
--- a/bridge/link.c
+++ b/bridge/link.c
@@ -78,6 +78,21 @@ void print_stp_state(__u8 state)
                             "state (%d) ", state);
 }
 
+int parse_stp_state(const char *arg)
+{
+       size_t nstates = ARRAY_SIZE(stp_states);
+       int state;
+
+       for (state = 0; state < nstates; state++)
+               if (strcmp(stp_states[state], arg) == 0)
+                       break;
+
+       if (state == nstates)
+               state = -1;
+
+       return state;
+}
+
 static void print_hwmode(__u16 mode)
 {
        if (mode >= ARRAY_SIZE(hw_mode))
@@ -359,14 +374,11 @@ static int brlink_modify(int argc, char **argv)
                } else if (strcmp(*argv, "state") == 0) {
                        NEXT_ARG();
                        char *endptr;
-                       size_t nstates = ARRAY_SIZE(stp_states);
 
                        state = strtol(*argv, &endptr, 10);
                        if (!(**argv != '\0' && *endptr == '\0')) {
-                               for (state = 0; state < nstates; state++)
-                                       if (strcasecmp(stp_states[state], *argv) == 0)
-                                               break;
-                               if (state == nstates) {
+                               state = parse_stp_state(*argv);
+                               if (state == -1) {
                                        fprintf(stderr,
                                                "Error: invalid STP port state\n");
                                        return -1;