diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-25 11:59:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-25 11:59:11 -0700 |
| commit | ff8744b5eb116fdf9b80a6ff774393afac7325bd (patch) | |
| tree | 2242c8dbf159416e8614877e64c34768b9bd75b9 /drivers/net/ethernet/intel/ice/ice_dcb_lib.c | |
| parent | 17081633e22d83be928a779fd7acd04b247dec90 (diff) | |
| parent | b81c191c468bb9f9e63cb19cdf090732e3218dce (diff) | |
| download | linux-ff8744b5eb116fdf9b80a6ff774393afac7325bd.tar.gz linux-ff8744b5eb116fdf9b80a6ff774393afac7325bd.tar.bz2 linux-ff8744b5eb116fdf9b80a6ff774393afac7325bd.zip | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says:
====================
100GbE Intel Wired LAN Driver Updates 2021-06-25
This series contains updates to ice driver only.
Jesse adds support for tracepoints to aide in debugging.
Maciej adds support for PTP auxiliary pin support.
Victor removes the VSI info from the old aggregator when moving the VSI
to another aggregator.
Tony removes an unnecessary VSI assignment.
Christophe Jaillet fixes a memory leak for failed allocation in
ice_pf_dcb_cfg().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_dcb_lib.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c index 857dc62da7a8..926cf748c5ec 100644 --- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c @@ -316,8 +316,10 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) /* Notify AUX drivers about impending change to TCs */ event = kzalloc(sizeof(*event), GFP_KERNEL); - if (!event) - return -ENOMEM; + if (!event) { + ret = -ENOMEM; + goto free_cfg; + } set_bit(IIDC_EVENT_BEFORE_TC_CHANGE, event->type); ice_send_event_to_aux(pf, event); |