From e24970bce5f219d8aec63dee391097cf976bea49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fran=C3=A7ois=20romieu?= Date: Fri, 2 Mar 2012 04:43:14 +0000 Subject: [PATCH] --- yaml --- r: 288223 b: refs/heads/master c: 9c5028e9da1255dd2b99762d8627b88b29f68cce h: refs/heads/master i: 288221: fe32e0d0a7e5c15885e039fb655babf8ac7eb798 288219: 9e526e44c4c02783d630ef8d7e553453eb99c56d 288215: b1545c709b74159aa4b479d3b9938e077a189678 288207: 1cacd034bcbb88622fd41d9d58d7dae187e0a7a4 288191: e3453ba50121feeccce65efb7a2e10722309ba97 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/realtek/r8169.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index edc7eda28657..24daf6eb46b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f2010b2ad3d66d5291497c9b274315e7b807ecd +refs/heads/master: 9c5028e9da1255dd2b99762d8627b88b29f68cce diff --git a/trunk/drivers/net/ethernet/realtek/r8169.c b/trunk/drivers/net/ethernet/realtek/r8169.c index 7a0c800b50ad..1adf17757cea 100644 --- a/trunk/drivers/net/ethernet/realtek/r8169.c +++ b/trunk/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)