Skip to content

Commit c401b55

Browse files
author
Herton R. Krzesinski
committed
Merge: r8169: update the driver
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1976 Bugzilla: https://bugzilla.redhat.com/2159618 Driver update to current state. Tested: traffic tests with RTL8168evl/8111evl device Upstream Status: linux.git Depends: !1970 This commit is postponed because of CNB dependency: 599566c r8169: use devm_clk_get_optional_enabled() to simplify the code Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> Approved-by: Ivan Vecera <ivecera@redhat.com> Approved-by: Jonathan Toppins <jtoppins@redhat.com> Approved-by: Stefan Assmann <sassmann@redhat.com> Approved-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 57b8539 + bb96eb7 commit c401b55

File tree

4 files changed

+66
-101
lines changed

4 files changed

+66
-101
lines changed

drivers/net/ethernet/realtek/r8169.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ enum mac_version {
2323
RTL_GIGA_MAC_VER_09,
2424
RTL_GIGA_MAC_VER_10,
2525
RTL_GIGA_MAC_VER_11,
26-
RTL_GIGA_MAC_VER_12,
27-
RTL_GIGA_MAC_VER_13,
26+
/* RTL_GIGA_MAC_VER_12 was handled the same as VER_17 */
27+
/* RTL_GIGA_MAC_VER_13 was merged with VER_10 */
2828
RTL_GIGA_MAC_VER_14,
29-
RTL_GIGA_MAC_VER_16,
29+
/* RTL_GIGA_MAC_VER_16 was merged with VER_10 */
3030
RTL_GIGA_MAC_VER_17,
3131
RTL_GIGA_MAC_VER_18,
3232
RTL_GIGA_MAC_VER_19,

0 commit comments

Comments
 (0)