Use netdev_feature_xxx helpers to replace the logical operation for netdev features.
Signed-off-by: Jian Shen shenjian15@huawei.com --- drivers/staging/octeon/ethernet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 5d24c1b6663b..e427f65ebc5c 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -422,10 +422,11 @@ int cvm_oct_common_init(struct net_device *dev) priv->queue = -1;
if (priv->queue != -1) - dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM; + netdev_feature_set_bits(NETIF_F_SG | NETIF_F_IP_CSUM, + &dev->features);
/* We do our own locking, Linux doesn't need to */ - dev->features |= NETIF_F_LLTX; + netdev_feature_set_bit(NETIF_F_LLTX_BIT, &dev->features); dev->ethtool_ops = &cvm_oct_ethtool_ops;
cvm_oct_set_mac_filter(dev);