r8169: restrict rtl_is_8168evl_up to RTL8168 chip versions

hkallweit · davem330 · commit c623305bf465 · 2019-08-29T17:47:26.000-07:00
Extend helper rtl_is_8168evl_up to properly work once we add
mac version numbers &gt;51 for RTL8125.

Signed-off-by: Heiner Kallweit &lt;hkallweit1@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
@@ -730,7 +730,8 @@ static void rtl_tx_performance_tweak(struct rtl8169_private *tp, u16 force)
 static bool rtl_is_8168evl_up(struct rtl8169_private *tp)
 {
 	return tp->mac_version >= RTL_GIGA_MAC_VER_34 &&
-	       tp->mac_version != RTL_GIGA_MAC_VER_39;
+	       tp->mac_version != RTL_GIGA_MAC_VER_39 &&
+	       tp->mac_version <= RTL_GIGA_MAC_VER_51;
 }
 
 static bool rtl_supports_eee(struct rtl8169_private *tp)

Original file line number	Diff line number	Diff line change
`@@ -730,7 +730,8 @@ static void rtl_tx_performance_tweak(struct rtl8169_private *tp, u16 force)`
`730`	`730`	`static bool rtl_is_8168evl_up(struct rtl8169_private *tp)`
`731`	`731`	`{`
`732`	`732`	`return tp->mac_version >= RTL_GIGA_MAC_VER_34 &&`
`733`		`- tp->mac_version != RTL_GIGA_MAC_VER_39;`
	`733`	`+ tp->mac_version != RTL_GIGA_MAC_VER_39 &&`
	`734`	`+ tp->mac_version <= RTL_GIGA_MAC_VER_51;`
`734`	`735`	`}`
`735`	`736`
`736`	`737`	`static bool rtl_supports_eee(struct rtl8169_private *tp)`