vxlan: Cleanup IFLA_VXLAN_PORT_RANGE entry in vxlan_get_size()

This patch is basically a followup to commit 4e4b1798cc90 ("vxlan: Add
missing entries to vxlan_get_size()"). All of the attributes in
vxlan_get_size() appear in the same order that they are filled in
vxlan_fill_info() except for IFLA_VXLAN_PORT_RANGE. For consistency, move
that entry to match its order and add a comment, like for all other
entries.

Signed-off-by: Benjamin Poirier <bpoirier@nvidia.com>
Link: https://lore.kernel.org/r/20231027184410.236671-1-bpoirier@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 901c590caf2455a65f7372635e4f450c6ab6e22c..412c3c0b69901d114bb26ed6666c64fda4222832 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -4389,7 +4389,6 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head)
 
 static size_t vxlan_get_size(const struct net_device *dev)
 {
-
        return nla_total_size(sizeof(__u32)) +  /* IFLA_VXLAN_ID */
                nla_total_size(sizeof(struct in6_addr)) + /* IFLA_VXLAN_GROUP{6} */
                nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_LINK */
@@ -4407,7 +4406,6 @@ static size_t vxlan_get_size(const struct net_device *dev)
                nla_total_size(sizeof(__u8)) +  /* IFLA_VXLAN_COLLECT_METADATA */
                nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_AGEING */
                nla_total_size(sizeof(__u32)) + /* IFLA_VXLAN_LIMIT */
-               nla_total_size(sizeof(struct ifla_vxlan_port_range)) +
                nla_total_size(sizeof(__be16)) + /* IFLA_VXLAN_PORT */
                nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_CSUM */
                nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_TX */
@@ -4415,6 +4413,8 @@ static size_t vxlan_get_size(const struct net_device *dev)
                nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */
                nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */
                nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_LOCALBYPASS */
+               /* IFLA_VXLAN_PORT_RANGE */
+               nla_total_size(sizeof(struct ifla_vxlan_port_range)) +
                nla_total_size(0) + /* IFLA_VXLAN_GBP */
                nla_total_size(0) + /* IFLA_VXLAN_GPE */
                nla_total_size(0) + /* IFLA_VXLAN_REMCSUM_NOPARTIAL */