net/ifc: fix build with type virtio16

Message ID 20181008043204.175238-1-xiao.w.wang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series net/ifc: fix build with type virtio16 |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Xiao Wang Oct. 8, 2018, 4:32 a.m. UTC
  The typedef of "__virtio16" is introduced into Linux kernel in v3.19.
To prevent build error on old kernel, this patch replaces the
"__virtio" usage with "uint16_t".

Fixes: d7fe5a2861e7 ("net/ifc: support live migration")

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
---
 drivers/net/ifc/ifcvf_vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Ferruh Yigit Oct. 8, 2018, 12:52 p.m. UTC | #1
On 10/8/2018 5:32 AM, Xiao Wang wrote:
> The typedef of "__virtio16" is introduced into Linux kernel in v3.19.
> To prevent build error on old kernel, this patch replaces the
> "__virtio" usage with "uint16_t".
> 
> Fixes: d7fe5a2861e7 ("net/ifc: support live migration")
> 
> Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
  
Thomas Monjalon Oct. 8, 2018, 11:59 p.m. UTC | #2
08/10/2018 14:52, Ferruh Yigit:
> On 10/8/2018 5:32 AM, Xiao Wang wrote:
> > The typedef of "__virtio16" is introduced into Linux kernel in v3.19.
> > To prevent build error on old kernel, this patch replaces the
> > "__virtio" usage with "uint16_t".
> > 
> > Fixes: d7fe5a2861e7 ("net/ifc: support live migration")
> > 
> > Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
> 
> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied, thanks
  

Patch

diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
index 7d3085d8d..9d5594678 100644
--- a/drivers/net/ifc/ifcvf_vdpa.c
+++ b/drivers/net/ifc/ifcvf_vdpa.c
@@ -285,7 +285,7 @@  ifcvf_used_ring_log(struct ifcvf_hw *hw, uint32_t queue, uint8_t *log_buf)
 
 	pfn = hw->vring[queue].used / PAGE_SIZE;
 	size = hw->vring[queue].size * sizeof(struct vring_used_elem) +
-			sizeof(__virtio16) * 3;
+			sizeof(uint16_t) * 3;
 
 	for (i = 0; i <= size / PAGE_SIZE; i++)
 		__sync_fetch_and_or_8(&log_buf[(pfn + i) / 8],