|
|
@@ -422,15 +422,19 @@ static int i40e_set_ringparam(struct net_device *netdev,
|
|
|
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- new_tx_count = clamp_t(u32, ring->tx_pending,
|
|
|
- I40E_MIN_NUM_DESCRIPTORS,
|
|
|
- I40E_MAX_NUM_DESCRIPTORS);
|
|
|
- new_tx_count = ALIGN(new_tx_count, I40E_REQ_DESCRIPTOR_MULTIPLE);
|
|
|
-
|
|
|
- new_rx_count = clamp_t(u32, ring->rx_pending,
|
|
|
- I40E_MIN_NUM_DESCRIPTORS,
|
|
|
- I40E_MAX_NUM_DESCRIPTORS);
|
|
|
- new_rx_count = ALIGN(new_rx_count, I40E_REQ_DESCRIPTOR_MULTIPLE);
|
|
|
+ if (ring->tx_pending > I40E_MAX_NUM_DESCRIPTORS ||
|
|
|
+ ring->tx_pending < I40E_MIN_NUM_DESCRIPTORS ||
|
|
|
+ ring->rx_pending > I40E_MAX_NUM_DESCRIPTORS ||
|
|
|
+ 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_tx_count = ALIGN(ring->tx_pending, I40E_REQ_DESCRIPTOR_MULTIPLE);
|
|
|
+ new_rx_count = ALIGN(ring->rx_pending, I40E_REQ_DESCRIPTOR_MULTIPLE);
|
|
|
|
|
|
/* if nothing to do return success */
|
|
|
if ((new_tx_count == vsi->tx_rings[0]->count) &&
|