diff options
| author |   Francois Romieu <romieu@fr.zoreil.com> | 2008-10-16 22:04:07 +0200 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2008-10-22 06:22:04 -0400 |
| commit | cd926c7330ae76b620853533e68654a1ef0c2347 (patch) | |
| tree | 80fc6f24b0bb1ae6740b67e8204bce1e88669722 /drivers/net/r8169.c | |
| parent | tcp: should use number of sack blocks instead of -1 (diff) | |
| download | linux-dev-cd926c7330ae76b620853533e68654a1ef0c2347.tar.xz linux-dev-cd926c7330ae76b620853533e68654a1ef0c2347.zip | |
r8169: verbose mac address init
I prefer the debug information to be displayed until
the issue is properly handled.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index c821da21d8eb..cd9a21581f56 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1947,11 +1947,11 @@ static void rtl_init_mac_address(struct rtl8169_private *tp, u8 cfg1; int vpd_cap; u8 mac[8]; - DECLARE_MAC_BUF(buf); cfg1 = RTL_R8(Config1); if (!(cfg1 & VPD)) { - dprintk("VPD access not enabled, enabling\n"); + if (netif_msg_probe(tp)) + dev_info(&pdev->dev, "VPD access disabled, enabling\n"); RTL_W8(Cfg9346, Cfg9346_Unlock); RTL_W8(Config1, cfg1 | VPD); RTL_W8(Cfg9346, Cfg9346_Lock); @@ -1969,11 +1969,19 @@ static void rtl_init_mac_address(struct rtl8169_private *tp, */ if (rtl_eeprom_read(pdev, vpd_cap, 0x000e, (__le32*)&mac[0]) < 0 || rtl_eeprom_read(pdev, vpd_cap, 0x0012, (__le32*)&mac[4]) < 0) { - dprintk("Reading MAC address from EEPROM failed\n"); + if (netif_msg_probe(tp)) { + dev_warn(&pdev->dev, + "reading MAC address from EEPROM failed\n"); + } return; } - dprintk("MAC address found in EEPROM: %s\n", print_mac(buf, mac)); + if (netif_msg_probe(tp)) { + DECLARE_MAC_BUF(buf); + + dev_info(&pdev->dev, "MAC address found in EEPROM: %s\n", + print_mac(buf, mac)); + } /* Write MAC address */ rtl_rar_set(tp, mac); |