diff options
| author | David S. Miller <davem@davemloft.net> | 2024-03-06 10:28:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-03-06 10:28:02 +0000 |
| commit | f287d6aafda7e59fddc9316fe6f0c46c64847f10 (patch) | |
| tree | 5c20aa97e7becc954ac362ee40f2e7074ac8bfab /drivers/net/ethernet/intel/ice/ice_dpll.c | |
| parent | b7fb7729c94fb2d23c79ff44f7a2da089c92d81c (diff) | |
| parent | ba54b1a276a6b69d80649942fe5334d19851443e (diff) | |
| download | linux-stable-f287d6aafda7e59fddc9316fe6f0c46c64847f10.tar.gz linux-stable-f287d6aafda7e59fddc9316fe6f0c46c64847f10.tar.bz2 linux-stable-f287d6aafda7e59fddc9316fe6f0c46c64847f10.zip | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2024-03-05 (idpf, ice, i40e, igc, e1000e)
This series contains updates to idpf, ice, i40e, igc and e1000e drivers.
Emil disables local BH on NAPI schedule for proper handling of softirqs
on idpf.
Jake stops reporting of virtchannel RSS option which in unsupported on
ice.
Rand Deeb adds null check to prevent possible null pointer dereference
on ice.
Michal Schmidt moves DPLL mutex initialization to resolve uninitialized
mutex usage for ice.
Jesse fixes incorrect variable usage for calculating Tx stats on ice.
Ivan Vecera corrects logic for firmware equals check on i40e.
Florian Kauer prevents memory corruption for XDP_REDIRECT on igc.
Sasha reverts an incorrect use of FIELD_GET which caused a regression
for Wake on LAN on e1000e.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_dpll.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_dpll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c b/drivers/net/ethernet/intel/ice/ice_dpll.c index c59e972dbaae..bd9b1fed74ab 100644 --- a/drivers/net/ethernet/intel/ice/ice_dpll.c +++ b/drivers/net/ethernet/intel/ice/ice_dpll.c @@ -2120,6 +2120,7 @@ void ice_dpll_init(struct ice_pf *pf) struct ice_dplls *d = &pf->dplls; int err = 0; + mutex_init(&d->lock); err = ice_dpll_init_info(pf, cgu); if (err) goto err_exit; @@ -2132,7 +2133,6 @@ void ice_dpll_init(struct ice_pf *pf) err = ice_dpll_init_pins(pf, cgu); if (err) goto deinit_pps; - mutex_init(&d->lock); if (cgu) { err = ice_dpll_init_worker(pf); if (err) |