Skip to content
Commit f858e2fd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8152-fixes'



Hayes Wang says:

====================
r8152: fix 2.5G devices

v3:
For patch #2, modify the comment.

v2:
For patch #1, Remove inline for fc_pause_on_auto() and fc_pause_off_auto(),
and update the commit message.

For patch #2, define the magic value for OCP register 0xa424.

v1:
These patches are used to fix some issues of RTL8156.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 526f28bd cce8334f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment