X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Fstaging%2Frtl8712%2Frtl8712_recv.c;fp=kernel%2Fdrivers%2Fstaging%2Frtl8712%2Frtl8712_recv.c;h=fcb8c61b28844fa78eb4c5637a11f7fa102865bc;hb=fdb8b20906f3546ba6c2f9f0686d8a5189516ba3;hp=50227b598e0c3cecb0f7c07208fb04fe7f0aaa57;hpb=cc84a1f21026270463b580f2564f9d71912b20db;p=kvmfornfv.git

diff --git a/kernel/drivers/staging/rtl8712/rtl8712_recv.c b/kernel/drivers/staging/rtl8712/rtl8712_recv.c
index 50227b598..fcb8c61b2 100644
--- a/kernel/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/kernel/drivers/staging/rtl8712/rtl8712_recv.c
@@ -1056,7 +1056,8 @@ static int recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb)
 		/* for first fragment packet, driver need allocate 1536 +
 		 * drvinfo_sz + RXDESC_SIZE to defrag packet. */
 		if ((mf == 1) && (frag == 0))
-			alloc_sz = 1658;/*1658+6=1664, 1664 is 128 alignment.*/
+			/*1658+6=1664, 1664 is 128 alignment.*/
+			alloc_sz = max_t(u16, tmp_len, 1658);
 		else
 			alloc_sz = tmp_len;
 		/* 2 is for IP header 4 bytes alignment in QoS packet case.