Skip to content

Commit 7a516d3

Browse files
Howard Wangshemminger
authored andcommitted
net/r8169: simplify config method check with if
Signed-off-by: Howard Wang <[email protected]>
1 parent c1bdcb8 commit 7a516d3

File tree

5 files changed

+144
-591
lines changed

5 files changed

+144
-591
lines changed

drivers/net/r8169/r8169_compat.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ enum RTL_register_content {
310310
RxBufEmpty = 0x01,
311311

312312
/* Cfg9346 bits */
313+
Cfg9346_EEM_MASK = 0xC0,
313314
Cfg9346_Lock = 0x00,
314315
Cfg9346_Unlock = 0xC0,
315316
Cfg9346_EEDO = (1UL << 0),

drivers/net/r8169/r8169_ethdev.c

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,26 +164,19 @@ _rtl_setup_link(struct rte_eth_dev *dev)
164164

165165
/* Setup link speed and duplex */
166166
if (*link_speeds == RTE_ETH_LINK_SPEED_AUTONEG) {
167-
switch (hw->mcfg) {
168-
case CFG_METHOD_48:
169-
case CFG_METHOD_49:
170-
case CFG_METHOD_50:
171-
case CFG_METHOD_51:
172-
case CFG_METHOD_52:
173-
case CFG_METHOD_53:
174-
case CFG_METHOD_54:
175-
case CFG_METHOD_55:
176-
case CFG_METHOD_56:
177-
case CFG_METHOD_57:
178-
case CFG_METHOD_58:
167+
switch (hw->chipset_name) {
168+
case RTL8125A:
169+
case RTL8125B:
170+
case RTL8168KB:
171+
case RTL8125BP:
172+
case RTL8125D:
173+
case RTL8125CP:
179174
speed_mode = SPEED_2500;
180175
break;
181-
case CFG_METHOD_69:
182-
case CFG_METHOD_70:
183-
case CFG_METHOD_71:
176+
case RTL8126A:
184177
speed_mode = SPEED_5000;
185178
break;
186-
case CFG_METHOD_91:
179+
case RTL8127:
187180
speed_mode = SPEED_10000;
188181
break;
189182
default:

0 commit comments

Comments
 (0)