| From c8d7aa2ab97ce7536ff433f565dc3d7094ba35f3 Mon Sep 17 00:00:00 2001 |
| From: françois romieu <romieu@fr.zoreil.com> |
| Date: Fri, 2 Mar 2012 04:43:14 +0000 |
| Subject: r8169: corrupted IP fragments fix for large mtu. |
| |
| |
| From: françois romieu <romieu@fr.zoreil.com> |
| |
| [ Upstream commit 9c5028e9da1255dd2b99762d8627b88b29f68cce ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/realtek/r8169.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| --- a/drivers/net/ethernet/realtek/r8169.c |
| +++ b/drivers/net/ethernet/realtek/r8169.c |
| @@ -3781,12 +3781,20 @@ static void rtl8169_init_ring_indexes(st |
| |
| 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) |
