diff options
| author |   Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
| commit | 85f17d677f6c40069287617630f202eb20fcfe36 (patch) | |
| tree | a0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/net/ethernet/intel/ice/ice_txrx.c | |
| parent | macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff) | |
| parent | Linux 6.0-rc7 (diff) | |
| download | linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.tar.xz linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.zip | |
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_txrx.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_txrx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c index 836dce840712..97453d1dfafe 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c @@ -610,7 +610,7 @@ ice_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, if (test_bit(ICE_VSI_DOWN, vsi->state)) return -ENETDOWN; - if (!ice_is_xdp_ena_vsi(vsi) || queue_index >= vsi->num_xdp_txq) + if (!ice_is_xdp_ena_vsi(vsi)) return -ENXIO; if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) @@ -621,6 +621,9 @@ ice_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, xdp_ring = vsi->xdp_rings[queue_index]; spin_lock(&xdp_ring->tx_lock); } else { + /* Generally, should not happen */ + if (unlikely(queue_index >= vsi->num_xdp_txq)) + return -ENXIO; xdp_ring = vsi->xdp_rings[queue_index]; } |