Unconditionally increment the TSO flag has a side effect: it will also directly clear the flags in NETIF_F_ALL_FOR_ALL on the master device, which can cause issues such as the inability to enable the nocache copy feature on the bonding network card. So, when at least one slave device's TSO is enabled, there is no need to explicitly increment the TSO flag to the master device. Fixes: b0ce3508b25e ("bonding: allow TSO being set on bonding master") Signed-off-by: Di Zhu --- include/linux/netdevice.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index bf99fe8622da..2aca39f7f9e1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -5322,7 +5322,8 @@ netdev_features_t netdev_increment_features(netdev_features_t all, static inline netdev_features_t netdev_add_tso_features(netdev_features_t features, netdev_features_t mask) { - return netdev_increment_features(features, NETIF_F_ALL_TSO, mask); + return (features & NETIF_F_ALL_TSO) ? features : + netdev_increment_features(features, NETIF_F_ALL_TSO, mask); } int __netdev_update_features(struct net_device *dev); -- 2.34.1