Skip to content
Commit d5e6f064 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '40GbE-Intel-Wired-LAN-Driver-Updates-2020-10-12'



Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2020-10-12

This series contains updates to i40e and e1000 drivers.

Jaroslaw adds support for changing FEC on i40e if the firmware supports it.

Jesse fixes a kbuild-bot warning regarding ternary operator on e1000.

v2: Return -EOPNOTSUPP instead of -EINVAL when FEC settings are not
supported by firmware. Remove, unneeded, done label and return errors
directly in i40e_set_fec_param() for patch 1. Dropped, previous patch 2,
to send to net.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a003ec1f f2bf814a
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