|
 |
c639191 |
From 426a50e89645bde78c1ff7b286605105ddf5cc2a Mon Sep 17 00:00:00 2001
|
|
|
c639191 |
From: Jens Osterkamp <jens@linux.vnet.ibm.com>
|
|
|
c639191 |
Date: Tue, 8 Feb 2011 00:51:02 -0800
|
|
|
c639191 |
Subject: [PATCH 05/51] new: change the ECP ack timer from RTE based to fixed
|
|
|
c639191 |
|
|
|
c639191 |
This patch adapts the ECP ack timer value from the RTE based value to a
|
|
|
c639191 |
fixed one as described in newer drafts.
|
|
|
c639191 |
|
|
|
c639191 |
Signed-off-by: Jens Osterkamp <jens@linux.vnet.ibm.com>
|
|
|
c639191 |
Signed-off-by: Petr Sabata <psabata@redhat.com>
|
|
|
c639191 |
---
|
|
|
c639191 |
ecp/ecp.h | 3 +--
|
|
|
c639191 |
ecp/ecp_tx.c | 6 ++----
|
|
|
c639191 |
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
c639191 |
|
|
|
c639191 |
diff --git a/ecp/ecp.h b/ecp/ecp.h
|
|
|
c639191 |
index 2c0ea0f..7fbfa58 100644
|
|
|
c639191 |
--- a/ecp/ecp.h
|
|
|
c639191 |
+++ b/ecp/ecp.h
|
|
|
c639191 |
@@ -34,8 +34,7 @@
|
|
|
c639191 |
#define ECP_MAX_RETRIES 3
|
|
|
c639191 |
#define ECP_SEQUENCE_NR_START 0x0
|
|
|
c639191 |
|
|
|
c639191 |
-#define ECP_TRANSMISSION_TIMER(rte) EVB_RTM(rte)*EVB_RTG
|
|
|
c639191 |
-#define ECP_TRANSMISSION_DIVIDER 10000
|
|
|
c639191 |
+#define ECP_ACK_TIMER_DEFAULT 500000 /* 500 ms in us */
|
|
|
c639191 |
|
|
|
c639191 |
typedef enum {
|
|
|
c639191 |
ECP_REQUEST = 0,
|
|
|
c639191 |
diff --git a/ecp/ecp_tx.c b/ecp/ecp_tx.c
|
|
|
c639191 |
index 6dff8c7..54a278f 100644
|
|
|
c639191 |
--- a/ecp/ecp_tx.c
|
|
|
c639191 |
+++ b/ecp/ecp_tx.c
|
|
|
c639191 |
@@ -321,10 +321,8 @@ static void ecp_tx_start_ackTimer(struct vdp_data *vd)
|
|
|
c639191 |
|
|
|
c639191 |
vd->ecp.ackTimerExpired = false;
|
|
|
c639191 |
|
|
|
c639191 |
- rte = evb_get_rte(vd->ifname);
|
|
|
c639191 |
-
|
|
|
c639191 |
- secs = ECP_TRANSMISSION_TIMER(rte) / ECP_TRANSMISSION_DIVIDER;
|
|
|
c639191 |
- usecs = ECP_TRANSMISSION_TIMER(rte) % ECP_TRANSMISSION_DIVIDER;
|
|
|
c639191 |
+ secs = 0;
|
|
|
c639191 |
+ usecs = ECP_ACK_TIMER_DEFAULT;
|
|
|
c639191 |
|
|
|
c639191 |
LLDPAD_DBG("%s(%i)-%s: starting timer\n", __func__, __LINE__,
|
|
|
c639191 |
vd->ifname);
|
|
|
c639191 |
--
|
|
|
c639191 |
1.7.4.4
|
|
|
c639191 |
|