vxlan: Remove access to nexthop group struct
Subsystems (3)
David Ahern
maintainerPATCH 1/1 vxlan: Remove access to nexthop group struct
vxlan driver should be using helpers to access nexthop struct internals. Remove open check if whether nexthop is multipath in favor of the existing nexthop_is_multipath helper. Add a new helper, nexthop_has_v4, to cover the need to check has_v4 in a group.
Fixes 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
Cc Roopa Prabhu <[email protected]>
Signed-off-by David Ahern <[email protected]>
--- drivers/net/vxlan.c | 8 +++----- include/net/nexthop.h | 11 +++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-)
drivers/net/vxlan.c +3 -5
@@ -857,7 +857,6 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb, u32 nhid, struct netlink_ext_ack *extack) { struct nexthop *old_nh = rtnl_dereference(fdb->nh); -struct nh_group *nhg;struct nexthop *nh;int err = -EINVAL ;
@@ -881,8 +880,7 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb, goto err_inval; } - nhg =rtnl_dereference (nh->nh_grp); -if (!nh->is_group || !nhg->mpath) { +if (!nexthop_is_multipath (nh)) {NL_SET_ERR_MSG (extack,"Nexthop is not a multipath group" ); goto err_inval; }
@@ -890,14 +888,14 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,/* check nexthop group family */ switch (vxlan->default_dst.remote_ip.sa.sa_family) {case AF_INET : -if (!nhg->has_v4) { +if (!nexthop_has_v4 (nh)) { err = -EAFNOSUPPORT ;NL_SET_ERR_MSG (extack,"Nexthop group family not supported" ); goto err_inval; }break ;case AF_INET6 : -if (nhg->has_v4) { +if (nexthop_has_v4 (nh)) { err = -EAFNOSUPPORT ;NL_SET_ERR_MSG (extack,"Nexthop group family not supported" ); goto err_inval;
include/net/nexthop.h +11 -0
@@ -137,6 +137,17 @@ static inline bool nexthop_cmp(const struct nexthop *nh1,return nh1 == nh2; } +static inline bool nexthop_has_v4 (const struct nexthop *nh) +{ +if (nh->is_group) { +struct nh_group *nh_grp; + + nh_grp =rcu_dereference_rtnl (nh->nh_grp); +return nh_grp->has_v4; + } +return false; +} +static inline bool nexthop_is_multipath (const struct nexthop *nh) {if (nh->is_group) {
Signature · 1 line
2.17.1
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Tue, 9 Jun 2020 17:27:28 -0600
Quoted 9 lines
vxlan driver should be using helpers to access nexthop struct internals. Remove open check if whether nexthop is multipath in favor of the existing
nexthop_is_multipathhelper. Add a new helper,nexthop_has_v4, to cover the need to checkhas_v4in a group.Fixes 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")Cc Roopa Prabhu <[email protected]>Signed-off-by David Ahern <[email protected]>
Also applied, thanks David.