aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorVeena Parat <Veena.Parat@neterion.com>2007-07-23 02:39:43 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-30 15:56:04 -0400
commitb6627672a8d130014bfcf93bdf98253498633798 (patch)
treede4259b73916b441bdbde3af678ee1f8ff6db134 /drivers/net
parent491abf2537a01bef52bffc67001f59cce1fd0047 (diff)
S2IO: Implementing review comments from old patches
- Incorporated Jeff Garzik's comments on coding standards Signed-off-by: Veena Parat <veena.parat@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/s2io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ce3a6d9b13c8..5c0f80830939 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -84,7 +84,7 @@
84#include "s2io.h" 84#include "s2io.h"
85#include "s2io-regs.h" 85#include "s2io-regs.h"
86 86
87#define DRV_VERSION "2.0.23.1" 87#define DRV_VERSION "2.0.24.1"
88 88
89/* S2io Driver name & version. */ 89/* S2io Driver name & version. */
90static char s2io_driver_name[] = "Neterion"; 90static char s2io_driver_name[] = "Neterion";
@@ -4818,15 +4818,15 @@ static void s2io_ethtool_gringparam(struct net_device *dev,
4818 ering->rx_max_pending = MAX_RX_DESC_2; 4818 ering->rx_max_pending = MAX_RX_DESC_2;
4819 4819
4820 ering->tx_max_pending = MAX_TX_DESC; 4820 ering->tx_max_pending = MAX_TX_DESC;
4821 for (i = 0 ; i < sp->config.tx_fifo_num ; i++) { 4821 for (i = 0 ; i < sp->config.tx_fifo_num ; i++)
4822 tx_desc_count += sp->config.tx_cfg[i].fifo_len; 4822 tx_desc_count += sp->config.tx_cfg[i].fifo_len;
4823 } 4823
4824 DBG_PRINT(INFO_DBG,"\nmax txds : %d\n",sp->config.max_txds); 4824 DBG_PRINT(INFO_DBG,"\nmax txds : %d\n",sp->config.max_txds);
4825 ering->tx_pending = tx_desc_count; 4825 ering->tx_pending = tx_desc_count;
4826 rx_desc_count = 0; 4826 rx_desc_count = 0;
4827 for (i = 0 ; i < sp->config.rx_ring_num ; i++) { 4827 for (i = 0 ; i < sp->config.rx_ring_num ; i++)
4828 rx_desc_count += sp->config.rx_cfg[i].num_rxd; 4828 rx_desc_count += sp->config.rx_cfg[i].num_rxd;
4829 } 4829
4830 ering->rx_pending = rx_desc_count; 4830 ering->rx_pending = rx_desc_count;
4831 4831
4832 ering->rx_mini_max_pending = 0; 4832 ering->rx_mini_max_pending = 0;