ip: ip_common: Drop ipstats_stat_desc_xstats::inner_max

After the previous patch, this field is not read anymore. Drop it.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/ip/ip_common.h b/ip/ip_common.h
index 37de09d4fbc7e491e044f56c87e560a36694d011..3f55ea336b377aa51d0dda7ecb78fc62a27c70e2 100644 (file)
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -195,7 +195,6 @@ struct ipstats_stat_desc_xstats {
        const struct ipstats_stat_desc desc;
        int xstats_at;
        int link_type_at;
-       int inner_max;
        int inner_at;
        void (*show_cb)(const struct rtattr *at);
 };

diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index 19af67d001f0711da1b3e5156d9a5ffa1471f813..a964f547c01888080124fb100a0eee2f56bad2f6 100644 (file)
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c
@@ -940,7 +940,6 @@ ipstats_stat_desc_xstats_bond_lacp = {
        .desc = IPSTATS_STAT_DESC_XSTATS_LEAF("802.3ad"),
        .xstats_at = IFLA_STATS_LINK_XSTATS,
        .link_type_at = LINK_XSTATS_TYPE_BOND,
-       .inner_max = BOND_XSTATS_MAX,
        .inner_at = BOND_XSTATS_3AD,
        .show_cb = &bond_print_3ad_stats,
 };
@@ -962,7 +961,6 @@ ipstats_stat_desc_xstats_slave_bond_lacp = {
        .desc = IPSTATS_STAT_DESC_XSTATS_LEAF("802.3ad"),
        .xstats_at = IFLA_STATS_LINK_XSTATS_SLAVE,
        .link_type_at = LINK_XSTATS_TYPE_BOND,
-       .inner_max = BOND_XSTATS_MAX,
        .inner_at = BOND_XSTATS_3AD,
        .show_cb = &bond_print_3ad_stats,
 };

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index d98bfa5a8736f7e3677e5a9a1bb06567c8616409..3d54e2038b4e2b91a75b4c560cc155266e6bff6c 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -1075,7 +1075,6 @@ ipstats_stat_desc_xstats_bridge_stp = {
        .desc = IPSTATS_STAT_DESC_XSTATS_LEAF("stp"),
        .xstats_at = IFLA_STATS_LINK_XSTATS,
        .link_type_at = LINK_XSTATS_TYPE_BRIDGE,
-       .inner_max = BRIDGE_XSTATS_MAX,
        .inner_at = BRIDGE_XSTATS_STP,
        .show_cb = &bridge_print_stats_stp,
 };
@@ -1085,7 +1084,6 @@ ipstats_stat_desc_xstats_bridge_mcast = {
        .desc = IPSTATS_STAT_DESC_XSTATS_LEAF("mcast"),
        .xstats_at = IFLA_STATS_LINK_XSTATS,
        .link_type_at = LINK_XSTATS_TYPE_BRIDGE,
-       .inner_max = BRIDGE_XSTATS_MAX,
        .inner_at = BRIDGE_XSTATS_MCAST,
        .show_cb = &bridge_print_stats_mcast,
 };
@@ -1108,7 +1106,6 @@ ipstats_stat_desc_xstats_slave_bridge_stp = {
        .desc = IPSTATS_STAT_DESC_XSTATS_LEAF("stp"),
        .xstats_at = IFLA_STATS_LINK_XSTATS_SLAVE,
        .link_type_at = LINK_XSTATS_TYPE_BRIDGE,
-       .inner_max = BRIDGE_XSTATS_MAX,
        .inner_at = BRIDGE_XSTATS_STP,
        .show_cb = &bridge_print_stats_stp,
 };
@@ -1118,7 +1115,6 @@ ipstats_stat_desc_xstats_slave_bridge_mcast = {
        .desc = IPSTATS_STAT_DESC_XSTATS_LEAF("mcast"),
        .xstats_at = IFLA_STATS_LINK_XSTATS_SLAVE,
        .link_type_at = LINK_XSTATS_TYPE_BRIDGE,
-       .inner_max = BRIDGE_XSTATS_MAX,
        .inner_at = BRIDGE_XSTATS_MCAST,
        .show_cb = &bridge_print_stats_mcast,
 };