Commit f24ba014 authored by Zhu Lingshan's avatar Zhu Lingshan Committed by Pengyuan Zhao
Browse files

vDPA: fix 'cast to restricted le16' warnings in vdpa.c 

mainline inclusion
from mainline-v6.0-rc1
commit 79e0034c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5WXCZ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=79e0034cb3485e64622ec0aabf8a6f4f8143f47b



----------------------------------------------------------------------

This commit fixes spars warnings: cast to restricted __le16
in function vdpa_dev_net_config_fill() and
vdpa_fill_stats_rec()

Signed-off-by: default avatarZhu Lingshan <lingshan.zhu@intel.com>
Reviewed-by: default avatarParav Pandit <parav@nvidia.com>
Message-Id: <20220722115309.82746-7-lingshan.zhu@intel.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPengyuan Zhao <zhaopengyuan@hisilicon.com>
parent f8ad35cb

drivers/vdpa/vdpa.c

+3 −3
Original line number Diff line number Diff line
@@ -848,11 +848,11 @@ static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *ms 
		    config.mac))

		return -EMSGSIZE;



	val_u16 = le16_to_cpu(config.status);

	val_u16 = __virtio16_to_cpu(true, config.status);

	if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_STATUS, val_u16))

		return -EMSGSIZE;



	val_u16 = le16_to_cpu(config.mtu);

	val_u16 = __virtio16_to_cpu(true, config.mtu);

	if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MTU, val_u16))

		return -EMSGSIZE;
@@ -929,7 +929,7 @@ static int vdpa_fill_stats_rec(struct vdpa_device *vdev, struct sk_buff *msg, 
	}

	vdpa_get_config_unlocked(vdev, 0, &config, sizeof(config));



	max_vqp = le16_to_cpu(config.max_virtqueue_pairs);

	max_vqp = __virtio16_to_cpu(true, config.max_virtqueue_pairs);

	if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP, max_vqp))

		return -EMSGSIZE;