Merge branch 'master' into net-next

[mirror_iproute2.git] / ip / ipaddress.c

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 201225f74b1de38cad65dd034b095ffe841f7305..9797145023966a15b2ab9067b1dd28099c1d972f 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1146,7 +1146,7 @@ int print_linkinfo(const struct sockaddr_nl *who,
                          "mtu", "mtu %u ",
                          rta_getattr_u32(tb[IFLA_MTU]));
        if (tb[IFLA_XDP])
-               xdp_dump(fp, tb[IFLA_XDP]);
+               xdp_dump(fp, tb[IFLA_XDP], do_link, false);
        if (tb[IFLA_QDISC])
                print_string(PRINT_ANY,
                             "qdisc",
@@ -1306,7 +1306,6 @@ int print_linkinfo(const struct sockaddr_nl *who,
                }
        }
 
-
        if ((do_link || show_details) && tb[IFLA_IFALIAS]) {
                print_string(PRINT_FP, NULL, "%s    ", _SL_);
                print_string(PRINT_ANY,
@@ -1315,6 +1314,9 @@ int print_linkinfo(const struct sockaddr_nl *who,
                             rta_getattr_str(tb[IFLA_IFALIAS]));
        }
 
+       if ((do_link || show_details) && tb[IFLA_XDP])
+               xdp_dump(fp, tb[IFLA_XDP], true, true);
+
        if (do_link && show_stats) {
                print_string(PRINT_FP, NULL, "%s", _SL_);
                __print_link_stats(fp, tb);