Commit 25ac138f authored by Cosmin Ratiu's avatar Cosmin Ratiu Committed by Steffen Klassert
Browse files

xfrm: Use xdo.dev instead of xdo.real_dev 



The policy offload struct was reused from the state offload and
real_dev was copied from dev, but it was never set to anything else.
Simplify the code by always using xdo.dev for policies.

Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent d79444e8

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ mlx5e_ipsec_build_accel_pol_attrs(struct mlx5e_ipsec_pol_entry *pol_entry, 
static int mlx5e_xfrm_add_policy(struct xfrm_policy *x,

				 struct netlink_ext_ack *extack)

{

	struct net_device *netdev = x->xdo.real_dev;

	struct net_device *netdev = x->xdo.dev;

	struct mlx5e_ipsec_pol_entry *pol_entry;

	struct mlx5e_priv *priv;

	int err;

net/xfrm/xfrm_device.c

+0 −2
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, 


	xdo->dev = dev;

	netdev_tracker_alloc(dev, &xdo->dev_tracker, GFP_ATOMIC);

	xdo->real_dev = dev;

	xdo->type = XFRM_DEV_OFFLOAD_PACKET;

	switch (dir) {

	case XFRM_POLICY_IN:
@@ -400,7 +399,6 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, 
	err = dev->xfrmdev_ops->xdo_dev_policy_add(xp, extack);

	if (err) {

		xdo->dev = NULL;

		xdo->real_dev = NULL;

		xdo->type = XFRM_DEV_OFFLOAD_UNSPECIFIED;

		xdo->dir = 0;

		netdev_put(dev, &xdo->dev_tracker);

net/xfrm/xfrm_state.c

+0 −2
Original line number Diff line number Diff line
@@ -1555,7 +1555,6 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, 
			xso->type = XFRM_DEV_OFFLOAD_PACKET;

			xso->dir = xdo->dir;

			xso->dev = xdo->dev;

			xso->real_dev = xdo->real_dev;

			xso->flags = XFRM_DEV_OFFLOAD_FLAG_ACQ;

			netdev_hold(xso->dev, &xso->dev_tracker, GFP_ATOMIC);

			error = xso->dev->xfrmdev_ops->xdo_dev_state_add(x, NULL);
@@ -1563,7 +1562,6 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, 
				xso->dir = 0;

				netdev_put(xso->dev, &xso->dev_tracker);

				xso->dev = NULL;

				xso->real_dev = NULL;

				xso->type = XFRM_DEV_OFFLOAD_UNSPECIFIED;

				x->km.state = XFRM_STATE_DEAD;

				to_put = x;