bridge: mcast: Factor out a helper for PG entry size calculation

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

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

Therefore, as a preparation, factor out an helper to calculate the size
of an individual port group entry. When determining the size of the
reply this helper will be invoked for each port group 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/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 08de94bffc129fe6a73306475331b208d109cd1a..42983f6a0abd9a2aad32ca816e4fd71427bd30e8 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -450,18 +450,13 @@ static int nlmsg_populate_mdb_fill(struct sk_buff *skb,
        return -EMSGSIZE;
 }
 
-static size_t rtnl_mdb_nlmsg_size(struct net_bridge_port_group *pg)
+static size_t rtnl_mdb_nlmsg_pg_size(const struct net_bridge_port_group *pg)
 {
        struct net_bridge_group_src *ent;
        size_t nlmsg_size, addr_size = 0;
 
-       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));
 
@@ -511,6 +506,17 @@ static size_t rtnl_mdb_nlmsg_size(struct net_bridge_port_group *pg)
        return nlmsg_size;
 }
 
+static size_t rtnl_mdb_nlmsg_size(const struct net_bridge_port_group *pg)
+{
+       return NLMSG_ALIGN(sizeof(struct br_port_msg)) +
+              /* MDBA_MDB */
+              nla_total_size(0) +
+              /* MDBA_MDB_ENTRY */
+              nla_total_size(0) +
+              /* Port group entry */
+              rtnl_mdb_nlmsg_pg_size(pg);
+}
+
 void br_mdb_notify(struct net_device *dev,
                   struct net_bridge_mdb_entry *mp,
                   struct net_bridge_port_group *pg,