@@ -590,9 +590,9 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb)
590
590
return msg -> len ;
591
591
}
592
592
593
- #define VDPA_DEV_NET_ATTRS_MASK ((1 << VDPA_ATTR_DEV_NET_CFG_MACADDR) | \
594
- (1 << VDPA_ATTR_DEV_NET_CFG_MTU) | \
595
- (1 << VDPA_ATTR_DEV_NET_CFG_MAX_VQP))
593
+ #define VDPA_DEV_NET_ATTRS_MASK (BIT_ULL( VDPA_ATTR_DEV_NET_CFG_MACADDR) | \
594
+ BIT_ULL( VDPA_ATTR_DEV_NET_CFG_MTU) | \
595
+ BIT_ULL( VDPA_ATTR_DEV_NET_CFG_MAX_VQP))
596
596
597
597
static int vdpa_nl_cmd_dev_add_set_doit (struct sk_buff * skb , struct genl_info * info )
598
598
{
@@ -611,12 +611,12 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i
611
611
if (nl_attrs [VDPA_ATTR_DEV_NET_CFG_MACADDR ]) {
612
612
macaddr = nla_data (nl_attrs [VDPA_ATTR_DEV_NET_CFG_MACADDR ]);
613
613
memcpy (config .net .mac , macaddr , sizeof (config .net .mac ));
614
- config .mask |= ( 1 << VDPA_ATTR_DEV_NET_CFG_MACADDR );
614
+ config .mask |= BIT_ULL ( VDPA_ATTR_DEV_NET_CFG_MACADDR );
615
615
}
616
616
if (nl_attrs [VDPA_ATTR_DEV_NET_CFG_MTU ]) {
617
617
config .net .mtu =
618
618
nla_get_u16 (nl_attrs [VDPA_ATTR_DEV_NET_CFG_MTU ]);
619
- config .mask |= ( 1 << VDPA_ATTR_DEV_NET_CFG_MTU );
619
+ config .mask |= BIT_ULL ( VDPA_ATTR_DEV_NET_CFG_MTU );
620
620
}
621
621
if (nl_attrs [VDPA_ATTR_DEV_NET_CFG_MAX_VQP ]) {
622
622
config .net .max_vq_pairs =
@@ -828,7 +828,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev,
828
828
{
829
829
u16 val_u16 ;
830
830
831
- if ((features & ( 1ULL << VIRTIO_NET_F_MQ )) == 0 )
831
+ if ((features & BIT_ULL ( VIRTIO_NET_F_MQ )) == 0 )
832
832
return 0 ;
833
833
834
834
val_u16 = le16_to_cpu (config -> max_virtqueue_pairs );
0 commit comments