diff options
| author | Jakub Kicinski <[email protected]> | 2025-05-22 16:42:41 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-05-22 16:42:41 +0000 |
| commit | 33e1b1b3991ba8c0d02b2324a582e084272205d6 (patch) | |
| tree | 825acc434f186a95f35446afeccfc80f92c4e4cf /drivers/net/ethernet/intel/ice/ice_virtchnl.c | |
| parent | Merge branch 'net-mlx5-convert-mlx5-to-netdev-instance-locking' (diff) | |
| parent | Merge tag 'net-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-33e1b1b3991ba8c0d02b2324a582e084272205d6.tar.gz kernel-33e1b1b3991ba8c0d02b2324a582e084272205d6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.15-rc8).
Conflicts:
80f2ab46c2ee ("irdma: free iwdev->rf after removing MSI-X")
4bcc063939a5 ("ice, irdma: fix an off by one in error handling code")
c24a65b6a27c ("iidc/ice/irdma: Update IDC to support multiple consumers")
https://lore.kernel.org/[email protected]
No extra adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_virtchnl.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_virtchnl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c index b147f6cf2615..eeeb9968e477 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c @@ -4322,7 +4322,6 @@ static int ice_vc_repr_add_mac(struct ice_vf *vf, u8 *msg) } ice_vfhw_mac_add(vf, &al->list[i]); - vf->num_mac++; break; } |