From: Ivan Safonov Date: Tue, 21 Mar 2017 09:00:33 +0000 (+0300) Subject: staging:r8188eu: add iv length to frame data offset X-Git-Tag: v4.12-rc1~84^2~356 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90a69692508283d40b4de523c8d2d38c1bde6cc0;p=karo-tx-linux.git staging:r8188eu: add iv length to frame data offset If this frame contains IV/ICV fields, ether_type field located a little farther. This bug already fixed here: https://github.com/lwfinger/rtl8188eu/blob/master/core/rtw_recv.c#L569 . Signed-off-by: Ivan Safonov Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c index 556be8cacdfd..96526fe6f6db 100644 --- a/drivers/staging/rtl8188eu/core/rtw_recv.c +++ b/drivers/staging/rtl8188eu/core/rtw_recv.c @@ -452,7 +452,7 @@ static struct recv_frame *portctrl(struct adapter *adapter, if (auth_alg == 2) { /* get ether_type */ - ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE; + ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE + pfhdr->attrib.iv_len; memcpy(&be_tmp, ptr, 2); ether_type = ntohs(be_tmp);