On 08/12/2022 17:28, Ido Schimmel wrote: > Subsequent patches are going to add additional validation functions and > netlink policies. Some of these functions will need to perform parsing > using nla_parse_nested() and the new policies. > > In order to keep all the policies next to each other, move the current > policy to before the validation functions. > > Signed-off-by: Ido Schimmel <[email protected]> > --- > net/bridge/br_mdb.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c > index e3bd2122d559..fcdd464cf997 100644 > --- a/net/bridge/br_mdb.c > +++ b/net/bridge/br_mdb.c > @@ -663,6 +663,12 @@ void br_rtr_notify(struct net_device *dev, struct > net_bridge_mcast_port *pmctx, > rtnl_set_sk_err(net, RTNLGRP_MDB, err); > } > > +static const struct nla_policy br_mdbe_attrs_pol[MDBE_ATTR_MAX + 1] = { > + [MDBE_ATTR_SOURCE] = NLA_POLICY_RANGE(NLA_BINARY, > + sizeof(struct in_addr), > + sizeof(struct in6_addr)), > +}; > + > static bool is_valid_mdb_entry(struct br_mdb_entry *entry, > struct netlink_ext_ack *extack) > { > @@ -748,12 +754,6 @@ static bool is_valid_mdb_source(struct nlattr *attr, > __be16 proto, > return true; > } > > -static const struct nla_policy br_mdbe_attrs_pol[MDBE_ATTR_MAX + 1] = { > - [MDBE_ATTR_SOURCE] = NLA_POLICY_RANGE(NLA_BINARY, > - sizeof(struct in_addr), > - sizeof(struct in6_addr)), > -}; > - > static struct net_bridge_mcast * > __br_mdb_choose_context(struct net_bridge *br, > const struct br_mdb_entry *entry,
Acked-by: Nikolay Aleksandrov <[email protected]>
