Jeff,
This patch looks good. Please accept.
Ram
-Original Message-
From: Andy Gospodarek [mailto:[EMAIL PROTECTED]
Sent: Thursday, December 06, 2007 11:57 AM
To: netdev@vger.kernel.org
Cc: [EMAIL PROTECTED]; Rastapur Santosh; Sivakumar Subramani;
Sreenivasa Honnur
Subject: [PATCH] s2io: fix inconsistent hardware VLAN tagging during
driver init
The s2io driver keeps a local variable around (vlan_strip_flag) to
keep
track of the current state of the hardware and whether or not it will
strip VLAN tags on incoming packets. It seems as though the hardware
default is to strip them, but that variable is not set correctly
during
initialization if the default setup is used. This check ensures
vlan_strip_flag and the hardware setting are in sync.
These variables were introduced by this patch:
commit 926930b202d56c3dfb6aea0a0c6bfba2b87a8c03
Author: Sivakumar Subramani [EMAIL PROTECTED]
Date: Sat Feb 24 01:59:39 2007 -0500
so this problem hasn't been around forever.
Recent patches from Ramkrishna Vepa [EMAIL PROTECTED] removed
this
variable and would have worked around the problem, but they were not
accepted.
Signed-off-by: Andy Gospodarek [EMAIL PROTECTED]
---
s2io.c |5 +
1 files changed, 5 insertions(+)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 8b9f0ea..08c08de 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2151,6 +2151,11 @@ static int start_nic(struct s2io_nic *nic)
val64 = ~RX_PA_CFG_STRIP_VLAN_TAG;
writeq(val64, bar0-rx_pa_cfg);
vlan_strip_flag = 0;
+ } else {
+ val64 = readq(bar0-rx_pa_cfg);
+ val64 |= RX_PA_CFG_STRIP_VLAN_TAG;
+ writeq(val64, bar0-rx_pa_cfg);
+ vlan_strip_flag = 1;
}
/*
--
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
