Implementation of review comments - Incorporated Jeff Garzik's comments on coding standards - Incorporated Andreas Schwab's comments on redundant condition check
Signed-off-by: Veena Parat <[EMAIL PROTECTED]> --- diff -Nurp 2.0.23.1P3/drivers/net/s2io.c 2.0.23.1P4/drivers/net/s2io.c --- 2.0.23.1P3/drivers/net/s2io.c 2007-07-04 01:36:55.000000000 -0700 +++ 2.0.23.1P4/drivers/net/s2io.c 2007-07-04 02:54:29.000000000 -0700 @@ -84,7 +84,7 @@ #include "s2io.h" #include "s2io-regs.h" -#define DRV_VERSION "2.0.23.1" +#define DRV_VERSION "2.0.24.1" /* S2io Driver name & version. */ static char s2io_driver_name[] = "Neterion"; @@ -4836,15 +4836,13 @@ static void s2io_ethtool_gringparam(stru ering->rx_max_pending = MAX_RX_DESC_2; ering->tx_max_pending = MAX_TX_DESC; - for (i = 0 ; i < sp->config.tx_fifo_num ; i++) { + for (i = 0 ; i < sp->config.tx_fifo_num ; i++) tx_desc_count += sp->config.tx_cfg[i].fifo_len; - } DBG_PRINT(INFO_DBG,"\nmax txds : %d\n",sp->config.max_txds); ering->tx_pending = tx_desc_count; rx_desc_count = 0; - for (i = 0 ; i < sp->config.rx_ring_num ; i++) { + for (i = 0 ; i < sp->config.rx_ring_num ; i++) rx_desc_count += sp->config.rx_cfg[i].num_rxd; - } ering->rx_pending = rx_desc_count; ering->rx_mini_max_pending = 0; diff -Nurp 2.0.23.1P3/drivers/net/s2io.h 2.0.23.1P4/drivers/net/s2io.h --- 2.0.23.1P3/drivers/net/s2io.h 2007-07-03 23:58:40.000000000 -0700 +++ 2.0.23.1P4/drivers/net/s2io.h 2007-07-04 02:54:29.000000000 -0700 @@ -464,7 +464,7 @@ struct TxD { #define TXD_LIST_OWN_XENA BIT(7) #define TXD_T_CODE (BIT(12)|BIT(13)|BIT(14)|BIT(15)) #define TXD_T_CODE_OK(val) (|(val & TXD_T_CODE)) -#define GET_TXD_T_CODE(val) ((val & TXD_T_CODE)<<12) +#define GET_TXD_T_CODE(val) ((val & TXD_T_CODE)>> 48) #define TXD_GATHER_CODE (BIT(22) | BIT(23)) #define TXD_GATHER_CODE_FIRST BIT(22) #define TXD_GATHER_CODE_LAST BIT(23) @@ -503,6 +503,7 @@ struct RxD_t { u64 Control_1; #define RXD_OWN_XENA BIT(7) #define RXD_T_CODE (BIT(12)|BIT(13)|BIT(14)|BIT(15)) +#define GET_RXD_T_CODE(val) ((val & RXD_T_CODE) >> 48) #define RXD_FRAME_PROTO vBIT(0xFFFF,24,8) #define RXD_FRAME_PROTO_IPV4 BIT(27) #define RXD_FRAME_PROTO_IPV6 BIT(28) - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html