vxlan: mdb: Factor out a helper for remote entry size calculation

Currently, netlink notifications are sent for individual remote entries
and not for the entire MDB entry itself.

Subsequent patches are going to add MDB get support which will require
the VXLAN driver to reply with an entire MDB entry.

Therefore, as a preparation, factor out a helper to calculate the size
of an individual remote entry. When determining the size of the reply
this helper will be invoked for each remote entry in the MDB entry.

No functional changes intended.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan/vxlan_mdb.c b/drivers/net/vxlan/vxlan_mdb.c
index 6652fcce4bb29fa5b0f02a377b2cff32016ff92a..b1af22fea90c2be02c15505b3a6d4b8e596aed5a 100644 (file)
--- a/drivers/net/vxlan/vxlan_mdb.c
+++ b/drivers/net/vxlan/vxlan_mdb.c
@@ -925,23 +925,20 @@ vxlan_mdb_nlmsg_src_list_size(const struct vxlan_mdb_entry_key *group,
        return nlmsg_size;
 }
 
-static size_t vxlan_mdb_nlmsg_size(const struct vxlan_dev *vxlan,
-                                  const struct vxlan_mdb_entry *mdb_entry,
-                                  const struct vxlan_mdb_remote *remote)
+static size_t
+vxlan_mdb_nlmsg_remote_size(const struct vxlan_dev *vxlan,
+                           const struct vxlan_mdb_entry *mdb_entry,
+                           const struct vxlan_mdb_remote *remote)
 {
        const struct vxlan_mdb_entry_key *group = &mdb_entry->key;
        struct vxlan_rdst *rd = rtnl_dereference(remote->rd);
        size_t nlmsg_size;
 
-       nlmsg_size = NLMSG_ALIGN(sizeof(struct br_port_msg)) +
-                    /* MDBA_MDB */
-                    nla_total_size(0) +
-                    /* MDBA_MDB_ENTRY */
-                    nla_total_size(0) +
                     /* MDBA_MDB_ENTRY_INFO */
-                    nla_total_size(sizeof(struct br_mdb_entry)) +
+       nlmsg_size = nla_total_size(sizeof(struct br_mdb_entry)) +
                     /* MDBA_MDB_EATTR_TIMER */
                     nla_total_size(sizeof(u32));
+
        /* MDBA_MDB_EATTR_SOURCE */
        if (vxlan_mdb_is_sg(group))
                nlmsg_size += nla_total_size(vxlan_addr_size(&group->dst));
@@ -969,6 +966,19 @@ static size_t vxlan_mdb_nlmsg_size(const struct vxlan_dev *vxlan,
        return nlmsg_size;
 }
 
+static size_t vxlan_mdb_nlmsg_size(const struct vxlan_dev *vxlan,
+                                  const struct vxlan_mdb_entry *mdb_entry,
+                                  const struct vxlan_mdb_remote *remote)
+{
+       return NLMSG_ALIGN(sizeof(struct br_port_msg)) +
+              /* MDBA_MDB */
+              nla_total_size(0) +
+              /* MDBA_MDB_ENTRY */
+              nla_total_size(0) +
+              /* Remote entry */
+              vxlan_mdb_nlmsg_remote_size(vxlan, mdb_entry, remote);
+}
+
 static int vxlan_mdb_nlmsg_fill(const struct vxlan_dev *vxlan,
                                struct sk_buff *skb,
                                const struct vxlan_mdb_entry *mdb_entry,