Patchwork r8169: corrupted IP fragments fix for large mtu.

login
register
mail settings
Submitter fran├žois romieu
Date March 2, 2012, 2:43 p.m.
Message ID <20120302144314.GB31240@electric-eye.fr.zoreil.com>
Download mbox | patch
Permalink /patch/144269/
State Accepted
Delegated to: David Miller
Headers show

Comments

fran├žois romieu - March 2, 2012, 2:43 p.m.
Noticed with the 8168d (-vb-gr, aka RTL_GIGA_MAC_VER_26).

ConfigX registers should only be written while the Config9346 lock
is held.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Reported-by: Nick Bowler <nbowler@elliptictech.com>
Cc: Hayes Wang <hayeswang@realtek.com>
---

 drivers/net/ethernet/realtek/r8169.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
David Miller - March 3, 2012, 12:10 a.m.
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 2 Mar 2012 15:43:14 +0100

> Noticed with the 8168d (-vb-gr, aka RTL_GIGA_MAC_VER_26).
> 
> ConfigX registers should only be written while the Config9346 lock
> is held.
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> Reported-by: Nick Bowler <nbowler@elliptictech.com>
> Cc: Hayes Wang <hayeswang@realtek.com>

Applied and queued up for -stable, thanks a lot.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 7a0c800..1adf177 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -3781,12 +3781,20 @@  static void rtl8169_init_ring_indexes(struct rtl8169_private *tp)
 
 static void rtl_hw_jumbo_enable(struct rtl8169_private *tp)
 {
+	void __iomem *ioaddr = tp->mmio_addr;
+
+	RTL_W8(Cfg9346, Cfg9346_Unlock);
 	rtl_generic_op(tp, tp->jumbo_ops.enable);
+	RTL_W8(Cfg9346, Cfg9346_Lock);
 }
 
 static void rtl_hw_jumbo_disable(struct rtl8169_private *tp)
 {
+	void __iomem *ioaddr = tp->mmio_addr;
+
+	RTL_W8(Cfg9346, Cfg9346_Unlock);
 	rtl_generic_op(tp, tp->jumbo_ops.disable);
+	RTL_W8(Cfg9346, Cfg9346_Lock);
 }
 
 static void r8168c_hw_jumbo_enable(struct rtl8169_private *tp)