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 <si-wei.liu@oracle.com> Signed-off-by: Eli Cohen <elic@nvidia.com> Link: https://lore.kernel.org/r/20220105114646.577224-14-elic@nvidia.com Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
cbe777e98b
commit
47a1401ac9
@ -590,9 +590,9 @@ out:
|
||||
return msg->len;
|
||||
}
|
||||
|
||||
#define VDPA_DEV_NET_ATTRS_MASK ((1 << VDPA_ATTR_DEV_NET_CFG_MACADDR) | \
|
||||
(1 << VDPA_ATTR_DEV_NET_CFG_MTU) | \
|
||||
(1 << VDPA_ATTR_DEV_NET_CFG_MAX_VQP))
|
||||
#define VDPA_DEV_NET_ATTRS_MASK (BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR) | \
|
||||
BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MTU) | \
|
||||
BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MAX_VQP))
|
||||
|
||||
static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *info)
|
||||
{
|
||||
@ -611,12 +611,12 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i
|
||||
if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) {
|
||||
macaddr = nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]);
|
||||
memcpy(config.net.mac, macaddr, sizeof(config.net.mac));
|
||||
config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR);
|
||||
config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR);
|
||||
}
|
||||
if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]) {
|
||||
config.net.mtu =
|
||||
nla_get_u16(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]);
|
||||
config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MTU);
|
||||
config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MTU);
|
||||
}
|
||||
if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]) {
|
||||
config.net.max_vq_pairs =
|
||||
@ -828,7 +828,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev,
|
||||
{
|
||||
u16 val_u16;
|
||||
|
||||
if ((features & (1ULL << VIRTIO_NET_F_MQ)) == 0)
|
||||
if ((features & BIT_ULL(VIRTIO_NET_F_MQ)) == 0)
|
||||
return 0;
|
||||
|
||||
val_u16 = le16_to_cpu(config->max_virtqueue_pairs);
|
||||
|
Loading…
Reference in New Issue
Block a user