mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
vxlan: Add a function to init switchdev_notifier_vxlan_fdb_info
There are currently two places that need to initialize the notifier info structure, and one more is coming next when vxlan_fdb_replay() is introduced. These three instances have / will have very similar code that is easy to abstract away into a named function. Add such function, vxlan_fdb_switchdev_notifier_info(), and call it from vxlan_fdb_switchdev_call_notifiers() and vxlan_fdb_find_uc(). Signed-off-by: Petr Machata <petrm@mellanox.com> Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6b241e4116
commit
ff23b91ce1
1 changed files with 18 additions and 23 deletions
|
@ -358,6 +358,22 @@ static void __vxlan_fdb_notify(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
|
||||||
rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
|
rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void vxlan_fdb_switchdev_notifier_info(const struct vxlan_dev *vxlan,
|
||||||
|
const struct vxlan_fdb *fdb,
|
||||||
|
const struct vxlan_rdst *rd,
|
||||||
|
struct switchdev_notifier_vxlan_fdb_info *fdb_info)
|
||||||
|
{
|
||||||
|
fdb_info->info.dev = vxlan->dev;
|
||||||
|
fdb_info->remote_ip = rd->remote_ip;
|
||||||
|
fdb_info->remote_port = rd->remote_port;
|
||||||
|
fdb_info->remote_vni = rd->remote_vni;
|
||||||
|
fdb_info->remote_ifindex = rd->remote_ifindex;
|
||||||
|
memcpy(fdb_info->eth_addr, fdb->eth_addr, ETH_ALEN);
|
||||||
|
fdb_info->vni = fdb->vni;
|
||||||
|
fdb_info->offloaded = rd->offloaded;
|
||||||
|
fdb_info->added_by_user = fdb->flags & NTF_VXLAN_ADDED_BY_USER;
|
||||||
|
}
|
||||||
|
|
||||||
static void vxlan_fdb_switchdev_call_notifiers(struct vxlan_dev *vxlan,
|
static void vxlan_fdb_switchdev_call_notifiers(struct vxlan_dev *vxlan,
|
||||||
struct vxlan_fdb *fdb,
|
struct vxlan_fdb *fdb,
|
||||||
struct vxlan_rdst *rd,
|
struct vxlan_rdst *rd,
|
||||||
|
@ -371,18 +387,7 @@ static void vxlan_fdb_switchdev_call_notifiers(struct vxlan_dev *vxlan,
|
||||||
|
|
||||||
notifier_type = adding ? SWITCHDEV_VXLAN_FDB_ADD_TO_DEVICE
|
notifier_type = adding ? SWITCHDEV_VXLAN_FDB_ADD_TO_DEVICE
|
||||||
: SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE;
|
: SWITCHDEV_VXLAN_FDB_DEL_TO_DEVICE;
|
||||||
|
vxlan_fdb_switchdev_notifier_info(vxlan, fdb, rd, &info);
|
||||||
info = (struct switchdev_notifier_vxlan_fdb_info){
|
|
||||||
.remote_ip = rd->remote_ip,
|
|
||||||
.remote_port = rd->remote_port,
|
|
||||||
.remote_vni = rd->remote_vni,
|
|
||||||
.remote_ifindex = rd->remote_ifindex,
|
|
||||||
.vni = fdb->vni,
|
|
||||||
.offloaded = rd->offloaded,
|
|
||||||
.added_by_user = fdb->flags & NTF_VXLAN_ADDED_BY_USER,
|
|
||||||
};
|
|
||||||
memcpy(info.eth_addr, fdb->eth_addr, ETH_ALEN);
|
|
||||||
|
|
||||||
call_switchdev_notifiers(notifier_type, vxlan->dev,
|
call_switchdev_notifiers(notifier_type, vxlan->dev,
|
||||||
&info.info);
|
&info.info);
|
||||||
}
|
}
|
||||||
|
@ -539,17 +544,7 @@ int vxlan_fdb_find_uc(struct net_device *dev, const u8 *mac, __be32 vni,
|
||||||
}
|
}
|
||||||
|
|
||||||
rdst = first_remote_rcu(f);
|
rdst = first_remote_rcu(f);
|
||||||
|
vxlan_fdb_switchdev_notifier_info(vxlan, f, rdst, fdb_info);
|
||||||
memset(fdb_info, 0, sizeof(*fdb_info));
|
|
||||||
fdb_info->info.dev = dev;
|
|
||||||
fdb_info->remote_ip = rdst->remote_ip;
|
|
||||||
fdb_info->remote_port = rdst->remote_port;
|
|
||||||
fdb_info->remote_vni = rdst->remote_vni;
|
|
||||||
fdb_info->remote_ifindex = rdst->remote_ifindex;
|
|
||||||
fdb_info->vni = vni;
|
|
||||||
fdb_info->offloaded = rdst->offloaded;
|
|
||||||
fdb_info->added_by_user = f->flags & NTF_VXLAN_ADDED_BY_USER;
|
|
||||||
ether_addr_copy(fdb_info->eth_addr, mac);
|
|
||||||
|
|
||||||
out:
|
out:
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
Loading…
Reference in a new issue