These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / os_dep / xmit_linux.c

diff --git a/kernel/drivers/staging/rtl8188eu/os_dep/xmit_linux.c b/kernel/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
index 5acf9a9..1593e28 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
+++ b/kernel/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
@@ -52,7 +52,7 @@ uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)
 
 
        len =  rtw_remainder_len(pfile);
-       len = (rlen > len) ? len : rlen;
+       len = min(rlen, len);
 
        if (rmem)
                skb_copy_bits(pfile->pkt, pfile->buf_len-pfile->pkt_len, rmem, len);