Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

r8169: prettify mac_version 



...still a bit yucky though.

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

drivers/net/r8169.c

+10 −10
Original line number Diff line number Diff line
@@ -151,11 +151,11 @@ static const int multicast_filter_limit = 32; 
#define RTL_R32(reg)		((unsigned long) readl (ioaddr + (reg)))



enum mac_version {

	RTL_GIGA_MAC_VER_01 = 0x00,

	RTL_GIGA_MAC_VER_02 = 0x01,

	RTL_GIGA_MAC_VER_03 = 0x02,

	RTL_GIGA_MAC_VER_04 = 0x03,

	RTL_GIGA_MAC_VER_05 = 0x04,

	RTL_GIGA_MAC_VER_01 = 0x01, // 8169

	RTL_GIGA_MAC_VER_02 = 0x02, // 8169S

	RTL_GIGA_MAC_VER_03 = 0x03, // 8110S

	RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB

	RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd

	RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb

	RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be 8168Bf

	RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb 8101Ec
@@ -180,11 +180,11 @@ static const struct { 
	u8 mac_version;

	u32 RxConfigMask;	/* Clears the bits supported by this chip */

} rtl_chip_info[] = {

	_R("RTL8169",		RTL_GIGA_MAC_VER_01, 0xff7e1880),

	_R("RTL8169s/8110s",	RTL_GIGA_MAC_VER_02, 0xff7e1880),

	_R("RTL8169s/8110s",	RTL_GIGA_MAC_VER_03, 0xff7e1880),

	_R("RTL8169sb/8110sb",	RTL_GIGA_MAC_VER_04, 0xff7e1880),

	_R("RTL8169sc/8110sc",	RTL_GIGA_MAC_VER_05, 0xff7e1880),

	_R("RTL8169",		RTL_GIGA_MAC_VER_01, 0xff7e1880), // 8169

	_R("RTL8169s",		RTL_GIGA_MAC_VER_02, 0xff7e1880), // 8169S

	_R("RTL8110s",		RTL_GIGA_MAC_VER_03, 0xff7e1880), // 8110S

	_R("RTL8169sb/8110sb",	RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB

	_R("RTL8169sc/8110sc",	RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd

	_R("RTL8168b/8111b",	RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E

	_R("RTL8168b/8111b",	RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E

	_R("RTL8101e",		RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139