Commit b4e11253 authored by David S. Miller's avatar David S. Miller

Merge branch 'r8169-add-support-for-RTL8125'

Heiner Kallweit says:

====================
r8169: add support for RTL8125

This series adds support for the 2.5Gbps chip RTl8125. It can be found
on PCIe network cards, and on an increasing number of consumer gaming
mainboards. Series is partially based on the r8125 vendor driver.
Tested with a Delock 89531 PCIe card against a Netgear GS110MX
Multi-Gig switch.
Firmware isn't strictly needed, but on some systems there may be
compatibility issues w/o firmware. Firmware has been submitted to
linux-firmware.

v2:
- split first patch into 6 smaller ones to facilitate bisecting
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a4f1a02 b3a42e3a
...@@ -96,14 +96,19 @@ config 8139_OLD_RX_RESET ...@@ -96,14 +96,19 @@ config 8139_OLD_RX_RESET
old RX-reset behavior. If unsure, say N. old RX-reset behavior. If unsure, say N.
config R8169 config R8169
tristate "Realtek 8169 gigabit ethernet support" tristate "Realtek 8169/8168/8101/8125 ethernet support"
depends on PCI depends on PCI
select FW_LOADER select FW_LOADER
select CRC32 select CRC32
select PHYLIB select PHYLIB
select REALTEK_PHY select REALTEK_PHY
---help--- ---help---
Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. Say Y here if you have a Realtek Ethernet adapter belonging to
the following families:
RTL8169 Gigabit Ethernet
RTL8168 Gigabit Ethernet
RTL8101 Fast Ethernet
RTL8125 2.5GBit Ethernet
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called r8169. This is recommended. will be called r8169. This is recommended.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment