Skip to content

Commit 47a1401

Browse files
elic307imstsirkin
authored andcommitted
vdpa: Use BIT_ULL for bit operations
All masks in this file are 64 bits. Change BIT to BIT_ULL. Other occurences use (1 << val) which yields a 32 bit value. Change them to use BIT_ULL too. Reviewed-by: Si-Wei Liu <[email protected]> Signed-off-by: Eli Cohen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-by: Jason Wang <[email protected]>
1 parent cbe777e commit 47a1401

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/vdpa/vdpa.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -590,9 +590,9 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb)
590590
return msg->len;
591591
}
592592

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))
596596

597597
static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *info)
598598
{
@@ -611,12 +611,12 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i
611611
if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) {
612612
macaddr = nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]);
613613
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);
615615
}
616616
if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]) {
617617
config.net.mtu =
618618
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);
620620
}
621621
if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]) {
622622
config.net.max_vq_pairs =
@@ -828,7 +828,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev,
828828
{
829829
u16 val_u16;
830830

831-
if ((features & (1ULL << VIRTIO_NET_F_MQ)) == 0)
831+
if ((features & BIT_ULL(VIRTIO_NET_F_MQ)) == 0)
832832
return 0;
833833

834834
val_u16 = le16_to_cpu(config->max_virtqueue_pairs);

0 commit comments

Comments
 (0)