在 2021/8/11 22:45, Jian Shen 写道:
Use netdev_feature_xxx helpers to replace the logical operation for netdev features.
Signed-off-by: Jian Shen shenjian15@huawei.com
drivers/net/xen-netfront.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index e40de65..53408f7 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -240,7 +240,7 @@ static const struct attribute_group xennet_dev_group;
static bool xennet_can_sg(struct net_device *dev) {
- return dev->features & NETIF_F_SG;
- return netdev_feature_test_bit(NETIF_F_SG_BIT, dev->features); }
@@ -1345,28 +1345,29 @@ static void xennet_fix_features(struct net_device *dev, { struct netfront_info *np = netdev_priv(dev);
- if (*features & NETIF_F_SG &&
- if (netdev_feature_test_bit(NETIF_F_SG_BIT, *features) && !xenbus_read_unsigned(np->xbdev->otherend, "feature-sg", 0))
*features &= ~NETIF_F_SG;
netdev_feature_clear_bit(NETIF_F_SG_BIT, features);
- if (*features & NETIF_F_IPV6_CSUM &&
- if (netdev_feature_test_bit(NETIF_F_IPV6_CSUM_BIT, *features) && !xenbus_read_unsigned(np->xbdev->otherend, "feature-ipv6-csum-offload", 0))
*features &= ~NETIF_F_IPV6_CSUM;
netdev_feature_clear_bit(NETIF_F_IPV6_CSUM_BIT, features);
- if (*features & NETIF_F_TSO &&
- if (netdev_feature_test_bit(NETIF_F_TSO_BIT, *features) && !xenbus_read_unsigned(np->xbdev->otherend, "feature-gso-tcpv4", 0))
*features &= ~NETIF_F_TSO;
netdev_feature_clear_bit(NETIF_F_TSO_BIT, features);
- if (*features & NETIF_F_TSO6 &&
- if (netdev_feature_test_bit(NETIF_F_TSO6_BIT, *features) && !xenbus_read_unsigned(np->xbdev->otherend, "feature-gso-tcpv6", 0))
*features &= ~NETIF_F_TSO6;
netdev_feature_clear_bit(NETIF_F_TSO6_BIT, features);}
static int xennet_set_features(struct net_device *dev, netdev_features_t features) {
- if (!(features & NETIF_F_SG) && dev->mtu > ETH_DATA_LEN) {
- if (!netdev_feature_test_bit(NETIF_F_SG_BIT, features) &&
dev->mtu > ETH_DATA_LEN) {@@ -1543,19 +1544,21 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
netdev->netdev_ops = &xennet_netdev_ops;
- netdev->features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
NETIF_F_GSO_ROBUST;- netdev->hw_features = NETIF_F_SG |
NETIF_F_IPV6_CSUM |NETIF_F_TSO | NETIF_F_TSO6;
- netdev_feature_zero(&netdev->features);
- netdev_feature_set_bits(NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
NETIF_F_GSO_ROBUST, &netdev->features);- netdev_feature_zero(&netdev->hw_features);
- netdev_feature_set_bits(NETIF_F_SG |
NETIF_F_IPV6_CSUM |NETIF_F_TSO | NETIF_F_TSO6, &netdev->features);
it should be netdev->hw_features, not netdev->features, will fix it in next version
/* * Assume that all hw features are available for now. This set * will be adjusted by the call to netdev_update_features() in * xennet_connect() which is the earliest point where we can * negotiate with the backend regarding supported features. */
- netdev->features |= netdev->hw_features;
netdev_feature_or(&netdev->features, netdev->features,
netdev->hw_features);netdev->ethtool_ops = &xennet_ethtool_ops; netdev->min_mtu = ETH_MIN_MTU;