diff options
author | Serhey Popovych <serhe.popovych@gmail.com> | 2018-03-29 10:51:36 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2019-03-19 17:18:49 -0400 |
commit | b0ddfe2bb2bd80b1090d5bf42bb65243b76d3b97 (patch) | |
tree | 6e490599d6b3e29b1f85331441b98a0be734e8ea /drivers/net/ethernet/intel/e1000/e1000_main.c | |
parent | 310974faccda080a5e0388d79cf6190d6aa0f1fa (diff) |
intel: correct return from set features callback
According to comments in <linux/netdevice.h> we should return either >0
or -errno from ->ndo_set_features() if changing dev->features by itself.
Return 1 in such places to notify netdev_update_features() about applied
changes in dev->features.
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 8fe9af0e2ab7..a7c76732849f 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
@@ -820,7 +820,7 @@ static int e1000_set_features(struct net_device *netdev, | |||
820 | else | 820 | else |
821 | e1000_reset(adapter); | 821 | e1000_reset(adapter); |
822 | 822 | ||
823 | return 0; | 823 | return 1; |
824 | } | 824 | } |
825 | 825 | ||
826 | static const struct net_device_ops e1000_netdev_ops = { | 826 | static const struct net_device_ops e1000_netdev_ops = { |