aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000/e1000_main.c
diff options
context:
space:
mode:
authorSerhey Popovych <serhe.popovych@gmail.com>2018-03-29 17:51:36 +0300
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-03-19 14:18:49 -0700
commitb0ddfe2bb2bd80b1090d5bf42bb65243b76d3b97 (patch)
tree6e490599d6b3e29b1f85331441b98a0be734e8ea /drivers/net/ethernet/intel/e1000/e1000_main.c
parentvirtio_net: remove hcpu from virtnet_clean_affinity (diff)
downloadlinux-dev-b0ddfe2bb2bd80b1090d5bf42bb65243b76d3b97.tar.xz
linux-dev-b0ddfe2bb2bd80b1090d5bf42bb65243b76d3b97.zip
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.c2
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,
else
e1000_reset(adapter);
- return 0;
+ return 1;
}
static const struct net_device_ops e1000_netdev_ops = {