lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8169: verbose mac address init

Browse Source 
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>
This commit is contained in:
Francois Romieu
2008-10-16 22:04:07 +02:00
committed by Jeff Garzik
parent 75e3d8db53
commit cd926c7330
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/r8169.c
View File

@@ -1947,11 +1947,11 @@ static void rtl_init_mac_address(struct rtl8169_private *tp,
u8 cfg1; u8 cfg1;
int vpd_cap; int vpd_cap;
u8 mac[8]; u8 mac[8];
DECLARE_MAC_BUF(buf);
cfg1 = RTL_R8(Config1); cfg1 = RTL_R8(Config1);
if (!(cfg1 & VPD)) { 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(Cfg9346, Cfg9346_Unlock);
RTL_W8(Config1, cfg1 | VPD); RTL_W8(Config1, cfg1 | VPD);
RTL_W8(Cfg9346, Cfg9346_Lock); 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 || if (rtl_eeprom_read(pdev, vpd_cap, 0x000e, (__le32*)&mac[0]) < 0 ||
rtl_eeprom_read(pdev, vpd_cap, 0x0012, (__le32*)&mac[4]) < 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; 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 */ /* Write MAC address */
rtl_rar_set(tp, mac); rtl_rar_set(tp, mac);