net/mlx5e: Refactor duplicated code in mlx5e_ipsec_init_macs
ARP discovery code has same logic for RX and TX flows, but with different source and destination fields. Instead of duplicating same code in mlx5e_ipsec_init_macs, let's refactor. Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
94edec4484
Коммит
45fd01f2fb
|
@ -252,6 +252,8 @@ static void mlx5e_ipsec_init_macs(struct mlx5e_ipsec_sa_entry *sa_entry,
|
|||
struct net_device *netdev;
|
||||
struct neighbour *n;
|
||||
u8 addr[ETH_ALEN];
|
||||
const void *pkey;
|
||||
u8 *dst, *src;
|
||||
|
||||
if (attrs->mode != XFRM_MODE_TUNNEL ||
|
||||
attrs->type != XFRM_DEV_OFFLOAD_PACKET)
|
||||
|
@ -262,36 +264,31 @@ static void mlx5e_ipsec_init_macs(struct mlx5e_ipsec_sa_entry *sa_entry,
|
|||
mlx5_query_mac_address(mdev, addr);
|
||||
switch (attrs->dir) {
|
||||
case XFRM_DEV_OFFLOAD_IN:
|
||||
ether_addr_copy(attrs->dmac, addr);
|
||||
n = neigh_lookup(&arp_tbl, &attrs->saddr.a4, netdev);
|
||||
if (!n) {
|
||||
n = neigh_create(&arp_tbl, &attrs->saddr.a4, netdev);
|
||||
if (IS_ERR(n))
|
||||
return;
|
||||
neigh_event_send(n, NULL);
|
||||
attrs->drop = true;
|
||||
break;
|
||||
}
|
||||
neigh_ha_snapshot(addr, n, netdev);
|
||||
ether_addr_copy(attrs->smac, addr);
|
||||
src = attrs->dmac;
|
||||
dst = attrs->smac;
|
||||
pkey = &attrs->saddr.a4;
|
||||
break;
|
||||
case XFRM_DEV_OFFLOAD_OUT:
|
||||
ether_addr_copy(attrs->smac, addr);
|
||||
n = neigh_lookup(&arp_tbl, &attrs->daddr.a4, netdev);
|
||||
if (!n) {
|
||||
n = neigh_create(&arp_tbl, &attrs->daddr.a4, netdev);
|
||||
if (IS_ERR(n))
|
||||
return;
|
||||
neigh_event_send(n, NULL);
|
||||
attrs->drop = true;
|
||||
break;
|
||||
}
|
||||
neigh_ha_snapshot(addr, n, netdev);
|
||||
ether_addr_copy(attrs->dmac, addr);
|
||||
src = attrs->smac;
|
||||
dst = attrs->dmac;
|
||||
pkey = &attrs->daddr.a4;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
ether_addr_copy(src, addr);
|
||||
n = neigh_lookup(&arp_tbl, pkey, netdev);
|
||||
if (!n) {
|
||||
n = neigh_create(&arp_tbl, pkey, netdev);
|
||||
if (IS_ERR(n))
|
||||
return;
|
||||
neigh_event_send(n, NULL);
|
||||
attrs->drop = true;
|
||||
} else {
|
||||
neigh_ha_snapshot(addr, n, netdev);
|
||||
ether_addr_copy(dst, addr);
|
||||
}
|
||||
neigh_release(n);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче