[PATCH 3/4] staging:r8188eu: Remove struct pkt_file from rtw_xmitframe_coalesce()

[Ivan Safonov]

Struct pkt_file is a base to simple wrapper for skb_copy_bits().
Eliminate struct pkt_file usage in rtw_xmitframe_coalesce().

Signed-off-by: Ivan Safonov 
---
 drivers/staging/rtl8188eu/core/rtw_xmit.c | 17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c 
b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index eb46e34ba562..6b32c142fdcc 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -943,7 +943,6 @@ This sub-routine will perform all the following:
 */
 s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, 
struct xmit_frame *pxmitframe)
 {
-   struct pkt_file pktfile;
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
size_t addr;
u8 *pframe, *mem_start;
@@ -954,7 +953,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct 
sk_buff *pkt, struct
u8 *pbuf_start;
s32 bmcst = IS_MCAST(pattrib->ra);
s32 res = _SUCCESS;
-
+   size_t remainder = pkt->len - ETH_HLEN;
 
psta = rtw_get_stainfo(>stapriv, pattrib->ra);
 
@@ -979,9 +978,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct 
sk_buff *pkt, struct
goto exit;
}
 
-   _rtw_open_pktfile(pkt, );
-   _rtw_pktfile_read(, NULL, ETH_HLEN);
-
frg_inx = 0;
frg_len = pxmitpriv->frag_len - 4;/* 2346-4 = 2342 */
 
@@ -1038,12 +1034,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, 
struct sk_buff *pkt, struct
if ((pattrib->icv_len > 0) && (pattrib->bswenc))
mpdu_len -= pattrib->icv_len;
 
-   if (bmcst) {
-   /*  don't do fragment to broadcat/multicast packets */
-   mem_sz = _rtw_pktfile_read(, pframe, 
pattrib->pktlen);
-   } else {
-   mem_sz = _rtw_pktfile_read(, pframe, mpdu_len);
-   }
+   mem_sz = min_t(size_t, bmcst ? pattrib->pktlen : mpdu_len, 
remainder);
+   skb_copy_bits(pkt, pkt->len - remainder, pframe, mem_sz);
+   remainder -= mem_sz;
 
pframe += mem_sz;
 
@@ -1054,7 +1047,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, 
struct sk_buff *pkt, struct
 
frg_inx++;
 
-   if (bmcst || pktfile.pkt_len == 0) {
+   if (bmcst || remainder == 0) {
pattrib->nr_frags = frg_inx;
 
pattrib->last_txcmdsz = pattrib->hdrlen + 
pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
-- 
2.13.6

[PATCH 3/4] staging:r8188eu: Remove struct pkt_file from rtw_xmitframe_coalesce()

[Ivan Safonov]

Struct pkt_file is a base to simple wrapper for skb_copy_bits().
Eliminate struct pkt_file usage in rtw_xmitframe_coalesce().

Signed-off-by: Ivan Safonov 
---
 drivers/staging/rtl8188eu/core/rtw_xmit.c | 17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c 
b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index eb46e34ba562..6b32c142fdcc 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -943,7 +943,6 @@ This sub-routine will perform all the following:
 */
 s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, 
struct xmit_frame *pxmitframe)
 {
-   struct pkt_file pktfile;
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
size_t addr;
u8 *pframe, *mem_start;
@@ -954,7 +953,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct 
sk_buff *pkt, struct
u8 *pbuf_start;
s32 bmcst = IS_MCAST(pattrib->ra);
s32 res = _SUCCESS;
-
+   size_t remainder = pkt->len - ETH_HLEN;
 
psta = rtw_get_stainfo(>stapriv, pattrib->ra);
 
@@ -979,9 +978,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct 
sk_buff *pkt, struct
goto exit;
}
 
-   _rtw_open_pktfile(pkt, );
-   _rtw_pktfile_read(, NULL, ETH_HLEN);
-
frg_inx = 0;
frg_len = pxmitpriv->frag_len - 4;/* 2346-4 = 2342 */
 
@@ -1038,12 +1034,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, 
struct sk_buff *pkt, struct
if ((pattrib->icv_len > 0) && (pattrib->bswenc))
mpdu_len -= pattrib->icv_len;
 
-   if (bmcst) {
-   /*  don't do fragment to broadcat/multicast packets */
-   mem_sz = _rtw_pktfile_read(, pframe, 
pattrib->pktlen);
-   } else {
-   mem_sz = _rtw_pktfile_read(, pframe, mpdu_len);
-   }
+   mem_sz = min_t(size_t, bmcst ? pattrib->pktlen : mpdu_len, 
remainder);
+   skb_copy_bits(pkt, pkt->len - remainder, pframe, mem_sz);
+   remainder -= mem_sz;
 
pframe += mem_sz;
 
@@ -1054,7 +1047,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, 
struct sk_buff *pkt, struct
 
frg_inx++;
 
-   if (bmcst || pktfile.pkt_len == 0) {
+   if (bmcst || remainder == 0) {
pattrib->nr_frags = frg_inx;
 
pattrib->last_txcmdsz = pattrib->hdrlen + 
pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
-- 
2.13.6