From: David S. Miller Date: Fri, 4 Nov 2022 10:43:57 +0000 (+0000) Subject: Merge branch 'macsec-offload-fixes' X-Git-Tag: baikal/aarch64/sdk6.1~2684^2~44 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=bb1dd81e8a86fedac41fc094d31481ccc232eb91;p=kernel.git Merge branch 'macsec-offload-fixes' Sabrina Dubroca says: ==================== macsec: offload-related fixes I'm working on a dummy offload for macsec on netdevsim. It just has a small SecY and RXSC table so I can trigger failures easily on the ndo_* side. It has exposed a couple of issues. The first patch is a revert of commit 8480405e591a ("net: macsec: report real_dev features when HW offloading is enabled"). That commit tried to improve the performance of macsec offload by taking advantage of some of the NIC's features, but in doing so, broke macsec offload when the lower device supports both macsec and ipsec offload, as the ipsec offload feature flags were copied from the real device. Since the macsec device doesn't provide xdo_* ops, the XFRM core rejects the registration of the new macsec device in xfrm_api_check. I'm working on re-adding those feature flags when offload is available, but I haven't fully solved that yet. I think it would be safer to do that second part in net-next considering how complex feature interactions tend to be. v2: - better describe the issue introduced by commit 8480405e591a (Leon Romanovsky) - patch #3: drop unnecessary !! (Leon Romanovsky) v3: - patch #3: drop extra newline (Jakub Kicinski) ==================== Signed-off-by: David S. Miller --- bb1dd81e8a86fedac41fc094d31481ccc232eb91