* [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches
@ 2007-06-19 10:06 Veena Parat
2007-07-02 12:18 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Veena Parat @ 2007-06-19 10:06 UTC (permalink / raw)
To: netdev, jeff
Cc: Leonid.Grossman, ramkrishna.vepa, santosh.rastapur,
Sivakumar.Subramani, sreenivasa.honnur, Alicia.Pena,
sriram.rapuru
Implementation of review comments
1. Incorporated Jeff Garzik's comments on coding standards.
2. Incorporated Andreas Schwab's comments on redundant condition check.
Signed-off-by: Veena Parat <veena.parat@neterion.com>
---
diff -urpN patch_3/drivers/net/s2io.c patch_4/drivers/net/s2io.c
--- patch_3/drivers/net/s2io.c 2007-06-07 12:11:27.000000000 +0530
+++ patch_4/drivers/net/s2io.c 2007-06-07 12:00:16.000000000 +0530
@@ -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";
@@ -4837,15 +4837,15 @@ 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;
@@ -6723,13 +6723,7 @@ static int rx_osm_handler(struct ring_in
struct lro *lro;
skb->dev = dev;
-
- if (err) {
- /* Check for parity error */
- if (err & 0x1) {
- sp->mac_control.stats_info->sw_stat.parity_err_cnt++;
- }
- err >>= 48;
+ if ((err = GET_RXD_T_CODE(rxdp->Control_1))) {
switch(err) {
case 1:
sp->mac_control.stats_info->sw_stat.
diff -urpN patch_3/drivers/net/s2io.h patch_4/drivers/net/s2io.h
--- patch_3/drivers/net/s2io.h 2007-05-21 15:32:26.000000000 +0530
+++ patch_4/drivers/net/s2io.h 2007-06-07 12:07:01.000000000 +0530
@@ -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)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches
2007-06-19 10:06 [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches Veena Parat
@ 2007-07-02 12:18 ` Jeff Garzik
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2007-07-02 12:18 UTC (permalink / raw)
To: Veena Parat
Cc: netdev, Leonid.Grossman, ramkrishna.vepa, santosh.rastapur,
Sivakumar.Subramani, sreenivasa.honnur, Alicia.Pena,
sriram.rapuru
Veena Parat wrote:
> Implementation of review comments
> 1. Incorporated Jeff Garzik's comments on coding standards.
> 2. Incorporated Andreas Schwab's comments on redundant condition check.
>
> Signed-off-by: Veena Parat <veena.parat@neterion.com>
ACK but dropped due to patch #2 being dropped
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches
@ 2007-07-12 10:23 Veena Parat
2007-07-13 22:26 ` Francois Romieu
0 siblings, 1 reply; 5+ messages in thread
From: Veena Parat @ 2007-07-12 10:23 UTC (permalink / raw)
To: netdev, jeff; +Cc: support
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 <veena.parat@neterion.com>
---
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)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches
2007-07-12 10:23 Veena Parat
@ 2007-07-13 22:26 ` Francois Romieu
0 siblings, 0 replies; 5+ messages in thread
From: Francois Romieu @ 2007-07-13 22:26 UTC (permalink / raw)
To: Veena Parat; +Cc: netdev, jeff, support
Veena Parat <Veena.Parat@neterion.com> :
> 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 <veena.parat@neterion.com>
[...]
> 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)
I must be more dense than usual tonight but it does not seem related to
the description of the patch.
--
Ueimor
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches
@ 2007-07-23 6:39 Veena Parat
0 siblings, 0 replies; 5+ messages in thread
From: Veena Parat @ 2007-07-23 6:39 UTC (permalink / raw)
To: netdev, jeff; +Cc: support
- Incorporated Jeff Garzik's comments on coding standards
Signed-off-by: Veena Parat <veena.parat@neterion.com>
---
diff -urpN patch_3/drivers/net/s2io.c patch_4/drivers/net/s2io.c
--- patch_3/drivers/net/s2io.c 2007-07-19 17:44:54.000000000 +0530
+++ patch_4/drivers/net/s2io.c 2007-07-19 17:45:41.000000000 +0530
@@ -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";
@@ -4818,15 +4818,15 @@ 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;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-07-23 6:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-19 10:06 [PATCH 2.6.22 4/4]S2IO: Implementing review comments from old patches Veena Parat
2007-07-02 12:18 ` Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2007-07-12 10:23 Veena Parat
2007-07-13 22:26 ` Francois Romieu
2007-07-23 6:39 Veena Parat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).