leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging:r8188eu: update pkt->(data|tail|len) synchronously with rx_(data|tail|len) in recv_frame structure

Browse Source 
Original driver code uses rx_* members to store skb (pkt) fields
(instead of pkt->* members), pkt->* updated only after data
completely formed, not in process.

Update pkt->* after data buffer changed (with rx_*).

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov 2017-02-06 20:23:27 +03:00 committed by Greg Kroah-Hartman
parent bdf299c140
commit e038e67f08
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rtl8188eu/include/rtw_recv.h
View File

@ -261,6 +261,8 @@ static inline u8 *recvframe_pull(struct recv_frame *precvframe, int sz)
if (precvframe == NULL) if (precvframe == NULL)
return NULL; return NULL;
skb_pull(precvframe->pkt, sz);
precvframe->rx_data += sz; precvframe->rx_data += sz;
if (precvframe->rx_data > precvframe->rx_tail) { if (precvframe->rx_data > precvframe->rx_tail) {
precvframe->rx_data -= sz; precvframe->rx_data -= sz;
@ -278,7 +280,7 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, int sz)
if (precvframe == NULL) if (precvframe == NULL)
return NULL; return NULL;
skb_put(precvframe->pkt, sz);
precvframe->rx_tail += sz; precvframe->rx_tail += sz;
if (precvframe->rx_tail > precvframe->pkt->end) { if (precvframe->rx_tail > precvframe->pkt->end) {
@ -299,6 +301,7 @@ static inline u8 *recvframe_pull_tail(struct recv_frame *precvframe, int sz)
if (precvframe == NULL) if (precvframe == NULL)
return NULL; return NULL;
skb_trim(precvframe->pkt, precvframe->pkt->len - sz);
precvframe->rx_tail -= sz; precvframe->rx_tail -= sz;
if (precvframe->rx_tail < precvframe->rx_data) { if (precvframe->rx_tail < precvframe->rx_data) {
precvframe->rx_tail += sz; precvframe->rx_tail += sz;