Merge branch 'master' into net-next

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index 1e699601ffc2c557e1b1224653a16f2f6b1f7a25..e704e290ce4194278762eb584d09287fec5c3ec5 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -114,6 +114,18 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (tb[IFLA_BR_MAX_AGE])
                fprintf(f, "max_age %u ",
                        rta_getattr_u32(tb[IFLA_BR_MAX_AGE]));
+
+       if (tb[IFLA_BR_AGEING_TIME])
+               fprintf(f, "ageing_time %u ",
+                       rta_getattr_u32(tb[IFLA_BR_AGEING_TIME]));
+
+       if (tb[IFLA_BR_STP_STATE])
+               fprintf(f, "stp_state %u ",
+                       rta_getattr_u32(tb[IFLA_BR_STP_STATE]));
+
+       if (tb[IFLA_BR_PRIORITY])
+               fprintf(f, "priority %u ",
+                       rta_getattr_u16(tb[IFLA_BR_PRIORITY]));
 }
 
 static void bridge_print_help(struct link_util *lu, int argc, char **argv,