summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiawen Wu <jiawenwu@trustnetic.com>2024-05-17 14:51:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-30 09:49:51 +0200
commitaf61114b7c672d102a91715736be59cb6faa8d3d (patch)
tree4b4051b5f4c6bb26bc2bf479fcae171580588ad4
parentdd8d5cc4ce3a684a2e37af40746663d663f0404d (diff)
downloadlinux-stable-af61114b7c672d102a91715736be59cb6faa8d3d.tar.gz
linux-stable-af61114b7c672d102a91715736be59cb6faa8d3d.zip
net: wangxun: fix to change Rx features
[ Upstream commit 68067f065ee730c7c67b361c3c81808d25d5a90b ] Fix the issue where some Rx features cannot be changed. When using ethtool -K to turn off rx offload, it returns error and displays "Could not change any device features". And netdev->features is not assigned a new value to actually configure the hardware. Fixes: 6dbedcffcf54 ("net: libwx: Implement xx_set_features ops") Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/wangxun/libwx/wx_lib.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index 08d3e4069c5f..6aa6073476f7 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -2694,12 +2694,14 @@ int wx_set_features(struct net_device *netdev, netdev_features_t features)
wx->rss_enabled = false;
}
+ netdev->features = features;
+
if (changed &
(NETIF_F_HW_VLAN_CTAG_RX |
NETIF_F_HW_VLAN_STAG_RX))
wx_set_rx_mode(netdev);
- return 1;
+ return 0;
}
EXPORT_SYMBOL(wx_set_features);