Commit ca7cfd73 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 



Tony Nguyen says:

====================
Change MIN_TXD and MIN_RXD to allow set rx/tx value between 64 and 80

Olga Zaborska says:

Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx
value between 64 and 80. All igb, igbvf and igc devices can use as low as 64
descriptors.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 34413460 6319685b

drivers/net/ethernet/intel/igb/igb.h

+2 −2
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ struct igb_adapter; 
/* TX/RX descriptor defines */

#define IGB_DEFAULT_TXD		256

#define IGB_DEFAULT_TX_WORK	128

#define IGB_MIN_TXD		80

#define IGB_MIN_TXD		64

#define IGB_MAX_TXD		4096



#define IGB_DEFAULT_RXD		256

#define IGB_MIN_RXD		80

#define IGB_MIN_RXD		64

#define IGB_MAX_RXD		4096



#define IGB_DEFAULT_ITR		3 /* dynamic */

drivers/net/ethernet/intel/igbvf/igbvf.h

+2 −2
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ enum latency_range { 
/* Tx/Rx descriptor defines */

#define IGBVF_DEFAULT_TXD	256

#define IGBVF_MAX_TXD		4096

#define IGBVF_MIN_TXD		80

#define IGBVF_MIN_TXD		64



#define IGBVF_DEFAULT_RXD	256

#define IGBVF_MAX_RXD		4096

#define IGBVF_MIN_RXD		80

#define IGBVF_MIN_RXD		64



#define IGBVF_MIN_ITR_USECS	10 /* 100000 irq/sec */

#define IGBVF_MAX_ITR_USECS	10000 /* 100    irq/sec */

drivers/net/ethernet/intel/igc/igc.h

+2 −2
Original line number Diff line number Diff line
@@ -379,11 +379,11 @@ static inline u32 igc_rss_type(const union igc_adv_rx_desc *rx_desc) 
/* TX/RX descriptor defines */

#define IGC_DEFAULT_TXD		256

#define IGC_DEFAULT_TX_WORK	128

#define IGC_MIN_TXD		80

#define IGC_MIN_TXD		64

#define IGC_MAX_TXD		4096



#define IGC_DEFAULT_RXD		256

#define IGC_MIN_RXD		80

#define IGC_MIN_RXD		64

#define IGC_MAX_RXD		4096



/* Supported Rx Buffer Sizes */