Message ID | 1302615172-1646-1-git-send-email-bp@amd64.org |
---|---|
State | Rejected, archived |
Delegated to: | David Miller |
Headers | show |
From: Borislav Petkov <bp@amd64.org> Date: Tue, 12 Apr 2011 15:32:52 +0200 > From: Borislav Petkov <borislav.petkov@amd.com> > > When the driver fails loading the firmware, it doesn't say which patch > exactly it is missing. We have three different firmware images depending > on the hw revision, so mention the exact patch name it is unable to load > in the warning message. > > Cc: Francois Romieu <romieu@fr.zoreil.com> > Cc: netdev@vger.kernel.org > Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Seems reasonable, Francois? -- 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
On Tue, Apr 12, 2011 at 04:20:36PM -0700, David Miller wrote:
[...]
> Seems reasonable, Francois?
Yes, it makes sense.
The patch goes way beyond 80 cols but I'll do a round of
cleanups later anyway.
From: François Romieu <romieu@fr.zoreil.com> Date: Wed, 13 Apr 2011 19:48:52 +0200 > On Tue, Apr 12, 2011 at 04:20:36PM -0700, David Miller wrote: > [...] >> Seems reasonable, Francois? > > Yes, it makes sense. > > The patch goes way beyond 80 cols but I'll do a round of > cleanups later anyway. Ok. So will you submit this yourself later or should I just apply this myself directly to net-2.6? I'm fine either way. 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
[...] > Ok. So will you submit this yourself later or should I just > apply this myself directly to net-2.6? Please apply it directly. Thanks.
From: François Romieu <romieu@metropolis.fr.zoreil.com> Date: Sun, 17 Apr 2011 15:59:36 +0200 > On Sat, Apr 16, 2011 at 01:03:48PM +0200, François Romieu wrote: >> [...] >> > Ok. So will you submit this yourself later or should I just >> > apply this myself directly to net-2.6? >> >> Please apply it directly. > > Please don't. Ok. -- 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 493b0de..b068115 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2248,7 +2248,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp) rtl_writephy(tp, 0x05, 0x001b); if ((rtl_readphy(tp, 0x06) != 0xbf00) || (rtl_apply_firmware(tp, FIRMWARE_8168D_1) < 0)) { - netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n"); + netif_warn(tp, probe, tp->dev, "unable to apply firmware patch %s\n", FIRMWARE_8168D_1); } rtl_writephy(tp, 0x1f, 0x0000); @@ -2353,7 +2353,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp) rtl_writephy(tp, 0x05, 0x001b); if ((rtl_readphy(tp, 0x06) != 0xb300) || (rtl_apply_firmware(tp, FIRMWARE_8168D_2) < 0)) { - netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n"); + netif_warn(tp, probe, tp->dev, "unable to apply firmware patch %s\n", FIRMWARE_8168D_2); } rtl_writephy(tp, 0x1f, 0x0000); @@ -2475,7 +2475,7 @@ static void rtl8105e_hw_phy_config(struct rtl8169_private *tp) msleep(100); if (rtl_apply_firmware(tp, FIRMWARE_8105E_1) < 0) - netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n"); + netif_warn(tp, probe, tp->dev, "unable to apply firmware patch %s\n", FIRMWARE_8105E_1); rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init)); }