提交 349c6a53 编写于 作者: S Serhey Popovych 提交者: Xie XiuQi

intel: correct return from set features callback

mainline inclusion
from mainline-5.1
commit b0ddfe2bb2bd
category: bugfix
bugzilla: 15055
CVE: NA

-------------------------------------------------

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: NSerhey Popovych <serhe.popovych@gmail.com>
Tested-by: NAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NZhiqiang Liu <liuzhiqiang26@huawei.com>
Reviewed-by: NWenan Mao <maowenan@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 442b20fa
......@@ -2795,7 +2795,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 = {
......
......@@ -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 = {
......
......@@ -6982,7 +6982,7 @@ static int e1000_set_features(struct net_device *netdev,
else
e1000e_reset(adapter);
return 0;
return 1;
}
static const struct net_device_ops e1000e_netdev_ops = {
......
......@@ -2481,7 +2481,7 @@ static int igb_set_features(struct net_device *netdev,
else
igb_reset(adapter);
return 0;
return 1;
}
static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
......
......@@ -9674,7 +9674,7 @@ static int ixgbe_set_features(struct net_device *netdev,
NETIF_F_HW_VLAN_CTAG_FILTER))
ixgbe_set_rx_mode(netdev);
return 0;
return 1;
}
/**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册