Commit cd926c73 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

r8169: verbose mac address init 



I prefer the debug information to be displayed until
the issue is properly handled.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 75e3d8db

drivers/net/r8169.c

+12 −4
Original line number Diff line number Diff line
@@ -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);