diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-20 10:12:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-20 10:12:03 -0700 |
| commit | 8d3a3048c31332b24bcc8a6cf806827eb9d8c688 (patch) | |
| tree | 514520822cb62e9b06786fe9a8fe425322e0d8e6 /drivers/net/ethernet/intel/e100.c | |
| parent | 9bd5423fc75e8a1fc1f84c75c779bdc8aa4a36c2 (diff) | |
| parent | bb0e5837db3a194213dd40f05d272320e47dada0 (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
1GbE Intel Wired LAN Driver Updates 2019-03-19
This series contains updates to e100, e1000, e1000e, igb, igc and
ixgbe.
Serhey Popovych fixes the return value for several of our older
drivers for netdev_update_features() to notify of changes applied.
Kai-Heng Feng fixes the WoL setting for system suspend, which should
not set to runtime suspend settings for igb. Then fixes a power
management issue with e1000e for CNP+ devices.
Colin Ian King fixes whitespace issue (indentation), which helps with
readability.
Sasha provides the remaining changes for igc, including the enabling of
multi-queues to receive. Added support for displaying and configuring
network flow classification (NFC) via ethtool. Added additional
statistics and basic counters for igc. Fixed a typo, so it aligns with
our other drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e100.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 0fd268070fb4..a65d5a9ba7db 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2797,7 +2797,7 @@ static int e100_set_features(struct net_device *netdev, netdev->features = features; e100_exec_cb(nic, NULL, e100_configure); - return 0; + return 1; } static const struct net_device_ops e100_netdev_ops = { |