GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i40e: complain about out-of-range descriptor request

Browse source 
Instead of silently clamping the descriptor change request into
the proper range, fail the request and complain in the log file.

Change-Id: Id55ef59255d93c04bedffa8e25fe7ea796c90f32
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Shannon Nelson 2013-11-20 10:03:08 +00:00 • committed by Jeff Kirsher
parent 639dc3777f
commit 1fa18370e4
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View file

@ -422,15 +422,19 @@ static int i40e_set_ringparam(struct net_device *netdev,
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
return -EINVAL; return -EINVAL;
new_tx_count = clamp_t(u32, ring->tx_pending, if (ring->tx_pending > I40E_MAX_NUM_DESCRIPTORS ||
I40E_MIN_NUM_DESCRIPTORS, ring->tx_pending < I40E_MIN_NUM_DESCRIPTORS ||
I40E_MAX_NUM_DESCRIPTORS); ring->rx_pending > I40E_MAX_NUM_DESCRIPTORS ||
new_tx_count = ALIGN(new_tx_count, I40E_REQ_DESCRIPTOR_MULTIPLE); ring->rx_pending < I40E_MIN_NUM_DESCRIPTORS) {
netdev_info(netdev,
"Descriptors requested (Tx: %d / Rx: %d) out of range [%d-%d]\n",
ring->tx_pending, ring->rx_pending,
I40E_MIN_NUM_DESCRIPTORS, I40E_MAX_NUM_DESCRIPTORS);
return -EINVAL;
}
new_rx_count = clamp_t(u32, ring->rx_pending, new_tx_count = ALIGN(ring->tx_pending, I40E_REQ_DESCRIPTOR_MULTIPLE);
I40E_MIN_NUM_DESCRIPTORS, new_rx_count = ALIGN(ring->rx_pending, I40E_REQ_DESCRIPTOR_MULTIPLE);
I40E_MAX_NUM_DESCRIPTORS);
new_rx_count = ALIGN(new_rx_count, I40E_REQ_DESCRIPTOR_MULTIPLE);
/* if nothing to do return success */ /* if nothing to do return success */
if ((new_tx_count == vsi->tx_rings[0]->count) && if ((new_tx_count == vsi->tx_rings[0]->count) &&