Merge branch '40GbE-Intel-Wired-LAN-Driver-Updates-2020-10-12'
authorJakub Kicinski <kuba@kernel.org>
Wed, 14 Oct 2020 02:41:34 +0000 (19:41 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 14 Oct 2020 02:44:42 +0000 (19:44 -0700)
commitd5e6f064ac664aacc0a6f72691b27a6db9525a89
tree3a2495aa7db40a26796d4214956f23481d62b83c
parenta003ec1f47bc7c34e1dc96653b903c48f63adcdb
parentf2bf814a27c567abd51683e1e853ff3b5bbf9186
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: Jakub Kicinski <kuba@kernel.org>