diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-04-26 10:17:46 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-04-26 10:17:46 +0200 |
| commit | c248b27cfc0a8a5fee93e000d47e659bca335d0f (patch) | |
| tree | e4898df753acf2d2d9885844ea37b9f03ccf661c /drivers/net/ethernet/netronome/nfp | |
| parent | 28b17f6270f182e22cdad5a0fdc4979031e4486a (diff) | |
| parent | 50749f2dd6854a41830996ad302aef2ffaf011d8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c b/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c index c0dcce8ae437..b1f026b81dea 100644 --- a/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c +++ b/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c @@ -269,7 +269,7 @@ static void set_sha2_512hmac(struct nfp_ipsec_cfg_add_sa *cfg, int *trunc_len) static int nfp_net_xfrm_add_state(struct xfrm_state *x, struct netlink_ext_ack *extack) { - struct net_device *netdev = x->xso.dev; + struct net_device *netdev = x->xso.real_dev; struct nfp_ipsec_cfg_mssg msg = {}; int i, key_len, trunc_len, err = 0; struct nfp_ipsec_cfg_add_sa *cfg; @@ -513,7 +513,7 @@ static void nfp_net_xfrm_del_state(struct xfrm_state *x) .cmd = NFP_IPSEC_CFG_MSSG_INV_SA, .sa_idx = x->xso.offload_handle - 1, }; - struct net_device *netdev = x->xso.dev; + struct net_device *netdev = x->xso.real_dev; struct nfp_net *nn; int err; |