@@ -2648,11 +2648,12 @@ static int virtnet_set_features(struct net_device *dev,
u64 offloads;
int err;
- if ((dev->features ^ features) & NETIF_F_GRO_HW) {
+ if (netdev_feature_test_bit(NETIF_F_GRO_HW_BIT, dev->features) !=
+ netdev_feature_test_bit(NETIF_F_GRO_HW_BIT, features)) {
if (vi->xdp_enabled)
return -EBUSY;
- if (features & NETIF_F_GRO_HW)
+ if (netdev_feature_test_bit(NETIF_F_GRO_HW_BIT, features))
offloads = vi->guest_offloads_capable;
else
offloads = vi->guest_offloads_capable &
@@ -2907,7 +2908,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
if (vi->has_cvq) {
vi->cvq = vqs[total_vqs - 1];
if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VLAN))
- vi->dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+ netdev_feature_set_bit(NETIF_F_HW_VLAN_CTAG_FILTER_BIT,
+ &vi->dev->features);
}
for (i = 0; i < vi->max_queue_pairs; i++) {
@@ -3118,7 +3120,8 @@ static int virtnet_probe(struct virtio_device *vdev)
dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE |
IFF_TX_SKB_NO_LINEAR;
dev->netdev_ops = &virtnet_netdev;
- dev->features = NETIF_F_HIGHDMA;
+ netdev_feature_zero(&dev->features);
+ netdev_feature_set_bit(NETIF_F_HIGHDMA_BIT, &dev->features);
dev->ethtool_ops = &virtnet_ethtool_ops;
SET_NETDEV_DEV(dev, &vdev->dev);
@@ -3126,37 +3129,48 @@ static int virtnet_probe(struct virtio_device *vdev)
/* Do we support "hardware" checksums? */
if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
/* This opens up the world of extra features. */
- dev->hw_features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+ netdev_feature_set_bits(NETIF_F_HW_CSUM | NETIF_F_SG,
+ &dev->hw_features);
if (csum)
- dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG;
+ netdev_feature_set_bits(NETIF_F_HW_CSUM | NETIF_F_SG,
+ &dev->features);
if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
- dev->hw_features |= NETIF_F_TSO
- | NETIF_F_TSO_ECN | NETIF_F_TSO6;
+ netdev_feature_set_bits(NETIF_F_TSO | NETIF_F_TSO_ECN |
+ NETIF_F_TSO6,
+ &dev->hw_features);
}
/* Individual feature bits: what can host handle? */
if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO4))
- dev->hw_features |= NETIF_F_TSO;
+ netdev_feature_set_bit(NETIF_F_TSO_BIT,
+ &dev->hw_features);
if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_TSO6))
- dev->hw_features |= NETIF_F_TSO6;
+ netdev_feature_set_bit(NETIF_F_TSO6_BIT,
+ &dev->hw_features);
if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_ECN))
- dev->hw_features |= NETIF_F_TSO_ECN;
+ netdev_feature_set_bit(NETIF_F_TSO_ECN_BIT,
+ &dev->hw_features);
- dev->features |= NETIF_F_GSO_ROBUST;
+ netdev_feature_set_bit(NETIF_F_GSO_ROBUST_BIT, &dev->features);
- if (gso)
- dev->features |= dev->hw_features & NETIF_F_ALL_TSO;
+ if (gso) {
+ netdev_features_t tmp;
+
+ netdev_feature_copy(&tmp, dev->hw_features);
+ netdev_feature_and_bits(NETIF_F_ALL_TSO, &tmp);
+ netdev_feature_or(&dev->features, dev->features, tmp);
+ }
/* (!csum && gso) case will be fixed by register_netdev() */
}
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))
- dev->features |= NETIF_F_RXCSUM;
+ netdev_feature_set_bit(NETIF_F_RXCSUM_BIT, &dev->features);
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6))
- dev->features |= NETIF_F_GRO_HW;
+ netdev_feature_set_bit(NETIF_F_GRO_HW_BIT, &dev->features);
if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS))
- dev->hw_features |= NETIF_F_GRO_HW;
+ netdev_feature_set_bit(NETIF_F_GRO_HW_BIT, &dev->hw_features);
- dev->vlan_features = dev->features;
+ netdev_feature_copy(&dev->vlan_features, dev->features);
/* MTU range: 68 - 65535 */
dev->min_mtu = MIN_MTU;
Use netdev_feature_xxx helpers to replace the logical operation for netdev features. Signed-off-by: Jian Shen <shenjian15@huawei.com> --- drivers/net/virtio_net.c | 50 +++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-)