staging:r8188eu: replace rx_end member of recv_frame with pkt->end

rx_end is duplication of pkt->end pointer.
pkt->end is preferred, because it is native skb field
supported by skb_*() functions.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index 591dd9d902675cb71d901155246cdfc884b4bfd8..2e5caa4ac59d4e6e2f60ff98594ade17baf063bf 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -231,7 +231,6 @@ struct recv_frame {
        uint  len;
        u8 *rx_data;
        u8 *rx_tail;
-       u8 *rx_end;
        struct sta_info *psta;
        /* for A-MPDU Rx reordering buffer control */
        struct recv_reorder_ctrl *preorder_ctrl;
@@ -282,7 +281,7 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, int sz)
 
        precvframe->rx_tail += sz;
 
-       if (precvframe->rx_tail > precvframe->rx_end) {
+       if (precvframe->rx_tail > precvframe->pkt->end) {
                precvframe->rx_tail -= sz;
                return NULL;
        }

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index fd5cb8a008f25cd3f4ad243232f6e457c277d2c8..cdb2fd387056284738a4734d246559c9d3f8ba7e 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -125,7 +125,6 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
                if (pkt_copy) {
                        pkt_copy->dev = adapt->pnetdev;
                        precvframe->pkt = pkt_copy;
-                       precvframe->rx_end = pkt_copy->data + alloc_sz;
                        skb_reserve(pkt_copy, 8 - ((size_t)(pkt_copy->data) & 7));/* force pkt_copy->data at 8-byte alignment address */
                        skb_reserve(pkt_copy, shift_sz);/* force ip_hdr at 8-byte alignment address according to shift_sz. */
                        memcpy(pkt_copy->data, (pbuf + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len);