| Message ID | 20110624174944.GA3700@electric-eye.fr.zoreil.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Francois Romieu <romieu@fr.zoreil.com> Date: Fri, 24 Jun 2011 19:49:44 +0200 > Please pull from branch 'davem.r8169' in repository > > git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6.git davem.r8169 > > to get the change below. Pulled, thanks! -- 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
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 05d8178..5990621 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -742,7 +742,7 @@ static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd) msleep(2); for (i = 0; i < 5; i++) { udelay(100); - if (!(RTL_R32(ERIDR) & ERIAR_FLAG)) + if (!(RTL_R32(ERIAR) & ERIAR_FLAG)) break; }
Please pull from branch 'davem.r8169' in repository git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6.git davem.r8169 to get the change below. @Hayes: version 8.023.00 of Realtek's r8168 driver has the same problem. Distance from 'davem' (5c18e80be9ff362f6523b097d495bb2e2f939946) ---------------------------------------------------------------- 1e4e82baee8c2a8d753cbf6aa1a77326b71e59f0 Diffstat -------- drivers/net/r8169.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Shortlog -------- Francois Romieu (1): r8169: fix wrong register use. Patch -----