xen-netback: fix type mismatch warning

Wiht the latest rework of the xen-netback driver, we get a warning
on ARM about the types passed into min():

drivers/net/xen-netback/rx.c: In function 'xenvif_rx_next_chunk':
include/linux/kernel.h:739:16: error: comparison of distinct pointer types lacks a cast [-Werror]

The reason is that XEN_PAGE_SIZE is not size_t here. There
is no actual bug, and we can easily avoid the warning using the
min_t() macro instead of min().

Fixes: eb1723a29b9a ("xen-netback: refactor guest rx")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Paul Durrant <paul.durrant@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit f112be65fd3964ec2d56ddd0d5e6061b0fd502da)
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c
index 5744392701267d10ebabad365152de3edde2251a..5e2497b146a5dd92b143668133a2b13861137dc9 100644 (file)
--- a/drivers/net/xen-netback/rx.c
+++ b/drivers/net/xen-netback/rx.c
@@ -310,9 +310,9 @@ static void xenvif_rx_next_chunk(struct xenvif_queue *queue,
        frag_data += pkt->frag_offset;
        frag_len -= pkt->frag_offset;
 
-       chunk_len = min(frag_len, XEN_PAGE_SIZE - offset);
-       chunk_len = min(chunk_len,
-                       XEN_PAGE_SIZE - xen_offset_in_page(frag_data));
+       chunk_len = min_t(size_t, frag_len, XEN_PAGE_SIZE - offset);
+       chunk_len = min_t(size_t, chunk_len, XEN_PAGE_SIZE -
+                                            xen_offset_in_page(frag_data));
 
        pkt->frag_offset += chunk_len;