diff options
author | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 07:44:56 +0200 |
---|---|---|
committer | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 07:44:56 +0200 |
commit | c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8 (patch) | |
tree | 8db2b6a6ef0a08f6e9d78dde00bf44bf60d09d54 /drivers/net/ethernet/sfc/ptp.c | |
parent | 6c9cfb853063f317b2953c5e852b6bac1eb0cade (diff) | |
parent | 90ca51e8c654699b672ba61aeaa418dfb3252e5e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.6 net-next PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/ptp.c')
-rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 3eab1802f6b0..f54200f03e15 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -1359,7 +1359,9 @@ static int efx_ptp_insert_multicast_filters(struct efx_nic *efx) goto fail; rc = efx_ptp_insert_eth_multicast_filter(efx); - if (rc < 0) + + /* Not all firmware variants support this filter */ + if (rc < 0 && rc != -EPROTONOSUPPORT) goto fail; } |