[PATCH] e1000: fix set ringparam for ethtool returning error code on bad input

07177dde · Ganesh Venkatesan · Jeff Garzik · 6506c62e · 07177dde
Commit 07177dde authored Oct 15, 2004 by Ganesh Venkatesan Committed by Jeff Garzik Oct 15, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/net/e1000/e1000_ethtool.c drivers/net/e1000/e1000_ethtool.c +3 -0

No files found.
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -593,6 +593,9 @@ e1000_set_ringparam(struct net_device *netdev,
 	tx_old = adapter->tx_ring;
 	rx_old = adapter->rx_ring;

+	if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) 
+		return -EINVAL;
+
 	if(netif_running(adapter->netdev))
 		e1000_down(adapter);