Use netdev_feature_xxx helpers to replace the logical operation for netdev features. Signed-off-by: Jian Shen <shenjian15@huawei.com> --- drivers/net/ethernet/cortina/gemini.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 44397d1f44e4..bc3575dc2a87 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1980,17 +1980,19 @@ static void gmac_fix_features(struct net_device *netdev, netdev_features_t *features) { if (netdev->mtu + ETH_HLEN + VLAN_HLEN > MTU_SIZE_BIT_MASK) - *features &= ~GMAC_OFFLOAD_FEATURES; + netdev_feature_clear_bits(GMAC_OFFLOAD_FEATURES, features); } static int gmac_set_features(struct net_device *netdev, netdev_features_t features) { struct gemini_ethernet_port *port = netdev_priv(netdev); - int enable = features & NETIF_F_RXCSUM; unsigned long flags; + int enable; u32 reg; + enable = netdev_feature_test_bit(NETIF_F_RXCSUM_BIT, features); + spin_lock_irqsave(&port->config_lock, flags); reg = readl(port->gmac_base + GMAC_CONFIG0); @@ -2452,8 +2454,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) spin_lock_init(&port->config_lock); gmac_clear_hw_stats(netdev); - netdev->hw_features = GMAC_OFFLOAD_FEATURES; - netdev->features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO; + netdev_feature_zero(&netdev->hw_features); + netdev_feature_set_bits(GMAC_OFFLOAD_FEATURES, &netdev->hw_features); + netdev_feature_set_bits(GMAC_OFFLOAD_FEATURES | NETIF_F_GRO, + &netdev->features); /* We can handle jumbo frames up to 10236 bytes so, let's accept * payloads of 10236 bytes minus VLAN and ethernet header */ -- 2.33.0