Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Serhey Popovych and committed by
Jeff Kirsher
b0ddfe2b 310974fa

+5 -5
+1 -1
drivers/net/ethernet/intel/e100.c
··· 2797 2797 2798 2798 netdev->features = features; 2799 2799 e100_exec_cb(nic, NULL, e100_configure); 2800 - return 0; 2800 + return 1; 2801 2801 } 2802 2802 2803 2803 static const struct net_device_ops e100_netdev_ops = {
+1 -1
drivers/net/ethernet/intel/e1000/e1000_main.c
··· 820 820 else 821 821 e1000_reset(adapter); 822 822 823 - return 0; 823 + return 1; 824 824 } 825 825 826 826 static const struct net_device_ops e1000_netdev_ops = {
+1 -1
drivers/net/ethernet/intel/e1000e/netdev.c
··· 7003 7003 else 7004 7004 e1000e_reset(adapter); 7005 7005 7006 - return 0; 7006 + return 1; 7007 7007 } 7008 7008 7009 7009 static const struct net_device_ops e1000e_netdev_ops = {
+1 -1
drivers/net/ethernet/intel/igb/igb_main.c
··· 2480 2480 else 2481 2481 igb_reset(adapter); 2482 2482 2483 - return 0; 2483 + return 1; 2484 2484 } 2485 2485 2486 2486 static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
+1 -1
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
··· 9796 9796 NETIF_F_HW_VLAN_CTAG_FILTER)) 9797 9797 ixgbe_set_rx_mode(netdev); 9798 9798 9799 - return 0; 9799 + return 1; 9800 9800 } 9801 9801 9802 9802 /**