r8169: change type of member mac_version in rtl8169_private (76719ee2) · Commits · 戴 / test

drivers/net/ethernet/realtek/r8169.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ enum mac_version {
		RTL_GIGA_MAC_VER_49,
		RTL_GIGA_MAC_VER_50,
		RTL_GIGA_MAC_VER_51,
		RTL_GIGA_MAC_NONE = 0xff,
		RTL_GIGA_MAC_NONE
		};

		#define JUMBO_1K ETH_DATA_LEN
		@@ -639,7 +639,7 @@ struct rtl8169_private {
		struct phy_device *phydev;
		struct napi_struct napi;
		u32 msg_enable;
		u16 mac_version;
		enum mac_version mac_version;
		u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */
		u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
		u32 dirty_tx;
		@@ -4203,6 +4203,8 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
		rtl_eri_clear_bits(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000);
		RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~0x80);
		break;
		default:
		break;
		}
		}

		@@ -4230,6 +4232,8 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
		RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) \| 0xc0);
		rtl_eri_set_bits(tp, 0x1a8, ERIAR_MASK_1111, 0xfc000000);
		break;
		default:
		break;
		}

		phy_resume(tp->phydev);