staging: rtl8188eu: clean-up struct recv_buf
cover staging: rtl8188eu: clean-up struct recv_buf
Following patches remove unnecessary member variables of struct recv_buf.
navin patidar (15):
staging: rtl8188eu: Remove function rtw_dequeue_recvbuf()
staging: rtl8188eu: Remove function rtw_enqueue_recvbuf_to_head()
staging: rtl8188eu: Remove function rtw_enqueue_recvbuf()
staging: rtl8188eu: Remove 'struct list_head list' from struct
recv_buf
staging: rtl8188eu: Remove 'spinlock_t recvbuf_lock' from struct
recv_buf
staging: rtl8188eu: Remove 'dma_addr_t dma_transfer_addr' from struct
recv_buf
staging: rtl8188eu: Remove 'int transfer_len' from struct recv_buf
staging: rtl8188eu: Remove pdata, phead, ptail and pend from struct
recv_buf
staging: rtl8188eu: Remove 'irp_pending' from struct recv_buf
staging: rtl8188eu: Remove 'pallocated_buf' from struct recv_buf
staging: rtl8188eu: Remove 'alloc_sz' from struct recv_buf
staging: rtl8188eu: Remove 'u32 len' from struct recv_buf
staging: rtl8188eu: Remove 'u32 ref_cnt' from struct recv_buf
staging: rtl8188eu: Remove rtl8188eu_init_recvbuf() function
staging: rtl8188eu: Remove 'u8 *pbuf' from struct recv_buf
drivers/staging/rtl8188eu/core/rtw_recv.c | 49 --------------------- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 20 --------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 17 +------ drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 1 - drivers/staging/rtl8188eu/include/rtw_recv.h | 17 ------- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 15 +------ 6 files changed, 3 insertions(+), 116 deletions(-)
--
1.7.10.4
PATCH 1/15 staging: rtl8188eu: Remove function rtw_dequeue_recvbuf()
rtw_dequeue_recvbuf() is not being used by driver.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 25 ------------------------- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 26 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -25
@@ -313,31 +313,6 @@ int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue)return _SUCCESS; } -struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue) -{ -unsigned long irqL; -struct recv_buf *precvbuf; -struct list_head *plist, *phead; - -spin_lock_irqsave (&queue->lock, irqL); - -if (_rtw_queue_empty (queue)) { - precvbuf =NULL ; - }else { - phead =get_list_head (queue); - - plist = phead->next; - - precvbuf = container_of(plist, struct recv_buf, list); - -rtw_list_delete (&precvbuf->list); - } - -spin_unlock_irqrestore (&queue->lock, irqL); - -return precvbuf; -} -static int recvframe_chkmic (struct adapter *adapter,struct recv_frame *precvframe) {
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -304,7 +304,6 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue,u32 rtw_free_uc_swdec_pending_queue (struct adapter *adapter);int rtw_enqueue_recvbuf_to_head (struct recv_buf *buf,struct __queue *queue);int rtw_enqueue_recvbuf (struct recv_buf *precvbuf,struct __queue *queue); -struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);void rtw_reordering_ctrl_timeout_handler (void *pcontext);
Signature · 1 line
1.7.10.4
PATCH 2/15 staging: rtl8188eu: Remove function rtw_enqueue_recvbuf_to_head()
In reply to navin patidarrtw_enqueue_recvbuf_to_head() is not being used by driver.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 12 ------------ drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 13 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -12
@@ -289,18 +289,6 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)return cnt; } -int rtw_enqueue_recvbuf_to_head (struct recv_buf *precvbuf,struct __queue *queue) -{ -spin_lock_bh (&queue->lock); - -rtw_list_delete (&precvbuf->list); -rtw_list_insert_head (&precvbuf->list,get_list_head (queue)); - -spin_unlock_bh (&queue->lock); - -return _SUCCESS; -} -int rtw_enqueue_recvbuf (struct recv_buf *precvbuf,struct __queue *queue) {unsigned long irqL;
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -302,7 +302,6 @@ int rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue);void rtw_free_recvframe_queue (struct __queue *pframequeue,struct __queue *pfree_recv_queue);u32 rtw_free_uc_swdec_pending_queue (struct adapter *adapter); -int rtw_enqueue_recvbuf_to_head (struct recv_buf *buf,struct __queue *queue);int rtw_enqueue_recvbuf (struct recv_buf *precvbuf,struct __queue *queue);void rtw_reordering_ctrl_timeout_handler (void *pcontext);
Signature · 1 line
1.7.10.4
PATCH 3/15 staging: rtl8188eu: Remove function rtw_enqueue_recvbuf()
In reply to navin patidarrtw_enqueue_recvbuf() is not being used by driver.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 12 ------------ drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 13 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -12
@@ -289,18 +289,6 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)return cnt; } -int rtw_enqueue_recvbuf (struct recv_buf *precvbuf,struct __queue *queue) -{ -unsigned long irqL; -spin_lock_irqsave (&queue->lock, irqL); - -rtw_list_delete (&precvbuf->list); - -rtw_list_insert_tail (&precvbuf->list,get_list_head (queue)); -spin_unlock_irqrestore (&queue->lock, irqL); -return _SUCCESS; -} -static int recvframe_chkmic (struct adapter *adapter,struct recv_frame *precvframe) {
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -302,7 +302,6 @@ int rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue);void rtw_free_recvframe_queue (struct __queue *pframequeue,struct __queue *pfree_recv_queue);u32 rtw_free_uc_swdec_pending_queue (struct adapter *adapter); -int rtw_enqueue_recvbuf (struct recv_buf *precvbuf,struct __queue *queue);void rtw_reordering_ctrl_timeout_handler (void *pcontext);
Signature · 1 line
1.7.10.4
PATCH 4/15 staging: rtl8188eu: Remove 'struct list_head list' from struct recv_buf
In reply to navin patidarUsers of 'struct list_head list' variable e.g. rtw_enqueue_recvbuf(), rtw_enqueue_recvbuf_to_head() and rtw_dequeue_recvbuf() are already removed.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -71,7 +71,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -_rtw_init_listhead (&precvbuf->list);spin_lock_init (&precvbuf->recvbuf_lock); precvbuf->alloc_sz =MAX_RECVBUF_SZ ; res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -235,7 +235,6 @@ struct sta_recv_priv { };struct recv_buf { -struct list_head list;spinlock_t recvbuf_lock;u32 ref_cnt;struct adapter *adapter;
Signature · 1 line
1.7.10.4
PATCH 5/15 staging: rtl8188eu: Remove 'spinlock_t recvbuf_lock' from struct recv_buf
In reply to navin patidarrecvbuf_lock is initialized inside rtl8188eu_init_recv_priv() but never used.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -71,7 +71,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -spin_lock_init (&precvbuf->recvbuf_lock); precvbuf->alloc_sz =MAX_RECVBUF_SZ ; res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);if (res == _FAIL)
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -235,7 +235,6 @@ struct sta_recv_priv { };struct recv_buf { -spinlock_t recvbuf_lock;u32 ref_cnt;struct adapter *adapter;u8 *pbuf;
Signature · 1 line
1.7.10.4
PATCH 6/15 staging: rtl8188eu: Remove 'dma_addr_t dma_transfer_addr' from struct recv_buf
In reply to navin patidarRemove unused variable dma_transfer_addr.
--- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -245,7 +245,6 @@ struct recv_buf {u8 *ptail;u8 *pend;struct urb *purb; -dma_addr_t dma_transfer_addr;/* (in) dma addr for transfer_buffer */ u32 alloc_sz;u8 irp_pending;int transfer_len;
Signature · 1 line
1.7.10.4
PATCH 7/15 staging: rtl8188eu: Remove 'int transfer_len' from struct recv_buf
In reply to navin patidarDriver is not making any use of value stored in this variable.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 -- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 1 - 4 files changed, 5 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -2
@@ -30,8 +30,6 @@void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *precvbuf) { - precvbuf->transfer_len =0 ; - precvbuf->len =0 ; precvbuf->ref_cnt =0 ;
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -1
@@ -518,7 +518,6 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) }else {rtw_reset_continual_urb_error (adapter_to_dvobj (adapt)); - precvbuf->transfer_len = purb->actual_length;skb_put (precvbuf->pskb, purb->actual_length);skb_queue_tail (&precvpriv->rx_skb_queue, precvbuf->pskb);
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -247,7 +247,6 @@ struct recv_buf {struct urb *purb;u32 alloc_sz;u8 irp_pending; -int transfer_len;struct sk_buff *pskb;u8 reuse; };
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
@@ -67,7 +67,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->phead =NULL ; precvbuf->ptail =NULL ; precvbuf->pend =NULL ; - precvbuf->transfer_len =0 ; precvbuf->len =0 ;return res; }
Signature · 1 line
1.7.10.4
PATCH 8/15 staging: rtl8188eu: Remove pdata, phead, ptail and pend from struct recv_buf
In reply to navin patidarDriver is not making use of value stored in removed variables.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 8 -------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 9 --------- drivers/staging/rtl8188eu/include/rtw_recv.h | 4 ---- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 4 ---- 4 files changed, 25 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -8
@@ -31,15 +31,7 @@void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *precvbuf) { precvbuf->len =0 ; - precvbuf->ref_cnt =0 ; - -if (precvbuf->pbuf) { - precvbuf->pdata = precvbuf->pbuf; - precvbuf->phead = precvbuf->pbuf; - precvbuf->ptail = precvbuf->pbuf; - precvbuf->pend = precvbuf->pdata +MAX_RECVBUF_SZ ; - } }int rtl8188eu_init_recv_priv (struct adapter *padapter)
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -9
@@ -615,18 +615,9 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 );skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); - precvbuf->phead = precvbuf->pskb->head; - precvbuf->pdata = precvbuf->pskb->data; - precvbuf->ptail =skb_tail_pointer (precvbuf->pskb); - precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; }else {/* reuse skb */ - precvbuf->phead = precvbuf->pskb->head; - precvbuf->pdata = precvbuf->pskb->data; - precvbuf->ptail =skb_tail_pointer (precvbuf->pskb); - precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; - precvbuf->reuse = false; }
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -4
@@ -240,10 +240,6 @@ struct recv_buf {u8 *pbuf;u8 *pallocated_buf;u32 len; -u8 *phead; -u8 *pdata; -u8 *ptail; -u8 *pend;struct urb *purb;u32 alloc_sz;u8 irp_pending;
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -4
@@ -63,10 +63,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->reuse = false; precvbuf->pallocated_buf =NULL ; precvbuf->pbuf =NULL ; - precvbuf->pdata =NULL ; - precvbuf->phead =NULL ; - precvbuf->ptail =NULL ; - precvbuf->pend =NULL ; precvbuf->len =0 ;return res; }
Signature · 1 line
1.7.10.4
PATCH 9/15 staging: rtl8188eu: Remove 'irp_pending' from struct recv_buf
In reply to navin patidarirp_pending is initialized to false inside rtw_os_recvbuf_resource_alloc() and value of irq_pending never changed after that, so 'if (!precvbuf->irp_pending)' inside rtw_os_read_port() function will be always true.
--- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -242,7 +242,6 @@ struct recv_buf {u32 len;struct urb *purb;u32 alloc_sz; -u8 irp_pending;struct sk_buff *pskb;u8 reuse; };
drivers/staging/rtl8188eu/os_dep/recv_linux.c +2 -4
@@ -55,7 +55,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, {int res = _SUCCESS; - precvbuf->irp_pending = false; precvbuf->purb =usb_alloc_urb (0 ,GFP_KERNEL );if (precvbuf->purb ==NULL ) res = _FAIL;
@@ -229,9 +228,8 @@ void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)dev_kfree_skb_any (precvbuf->pskb); precvbuf->pskb =NULL ; precvbuf->reuse = false; -if (!precvbuf->irp_pending) -rtw_read_port (padapter, precvpriv->ff_hwaddr,0 , - (unsigned char *)precvbuf); +rtw_read_port (padapter, precvpriv->ff_hwaddr,0 , + (unsigned char *)precvbuf); }static void _rtw_reordering_ctrl_timeout_handler (void *func_context)
Signature · 1 line
1.7.10.4
PATCH 10/15 staging: rtl8188eu: Remove 'pallocated_buf' from struct recv_buf
In reply to navin patidarpallocated_buf is not being used by driver.
--- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -238,7 +238,6 @@ struct recv_buf {u32 ref_cnt;struct adapter *adapter;u8 *pbuf; -u8 *pallocated_buf;u32 len;struct urb *purb;u32 alloc_sz;
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
@@ -60,7 +60,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, res = _FAIL; precvbuf->pskb =NULL ; precvbuf->reuse = false; - precvbuf->pallocated_buf =NULL ; precvbuf->pbuf =NULL ; precvbuf->len =0 ;return res;
Signature · 1 line
1.7.10.4
PATCH 11/15 staging: rtl8188eu: Remove 'alloc_sz' from struct recv_buf
In reply to navin patidarDriver isn't making any use of value stored in alloc_sz variable.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -61,7 +61,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { - precvbuf->alloc_sz =MAX_RECVBUF_SZ ; res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);if (res == _FAIL)break ;
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -240,7 +240,6 @@ struct recv_buf {u8 *pbuf;u32 len;struct urb *purb; -u32 alloc_sz;struct sk_buff *pskb;u8 reuse; };
Signature · 1 line
1.7.10.4
PATCH 12/15 staging: rtl8188eu: Remove 'u32 len' from struct recv_buf
In reply to navin patidarRemove unused variable 'u32 len'.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 1 - 3 files changed, 3 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -30,7 +30,6 @@void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *precvbuf) { - precvbuf->len =0 ; precvbuf->ref_cnt =0 ; }
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -238,7 +238,6 @@ struct recv_buf {u32 ref_cnt;struct adapter *adapter;u8 *pbuf; -u32 len;struct urb *purb;struct sk_buff *pskb;u8 reuse;
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
@@ -61,7 +61,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->pskb =NULL ; precvbuf->reuse = false; precvbuf->pbuf =NULL ; - precvbuf->len =0 ;return res; }
Signature · 1 line
1.7.10.4
PATCH 13/15 staging: rtl8188eu: Remove 'u32 ref_cnt' from struct recv_buf
In reply to navin patidarDriver isn't making any use of value stored in variable ref_cnt.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 2 -- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 1 - 3 files changed, 4 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -2
@@ -30,7 +30,6 @@void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *precvbuf) { - precvbuf->ref_cnt =0 ; }int rtl8188eu_init_recv_priv (struct adapter *padapter)
@@ -63,7 +62,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);if (res == _FAIL)break ; - precvbuf->ref_cnt =0 ; precvbuf->adapter = padapter; precvbuf++; }
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -235,7 +235,6 @@ struct sta_recv_priv { };struct recv_buf { -u32 ref_cnt;struct adapter *adapter;u8 *pbuf;struct urb *purb;
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
@@ -221,7 +221,6 @@ void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf) {struct recv_priv *precvpriv = &padapter->recvpriv; - precvbuf->ref_cnt--;/* free skb in recv_buf */ dev_kfree_skb_any (precvbuf->pskb); precvbuf->pskb =NULL ;
Signature · 1 line
1.7.10.4
PATCH 14/15 staging: rtl8188eu: Remove rtl8188eu_init_recvbuf() function
In reply to navin patidarrtl8188eu_init_recvbuf() function definition is empty now, so remove it.
--- drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 4 ---- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 2 -- drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 1 - 3 files changed, 7 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +0 -4
@@ -28,10 +28,6 @@#include <rtl8188e_hal.h> -void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *precvbuf) -{ -} -int rtl8188eu_init_recv_priv (struct adapter *padapter) {struct recv_priv *precvpriv = &padapter->recvpriv;
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -2
@@ -600,8 +600,6 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) precvbuf->reuse = true; } -rtl8188eu_init_recvbuf (adapter, precvbuf); -/* re-assign for linux based on skb */ if ((!precvbuf->reuse) || (precvbuf->pskb ==NULL )) { precvbuf->pskb =netdev_alloc_skb (adapter->pnetdev,MAX_RECVBUF_SZ +RECVBUFF_ALIGN_SZ );
drivers/staging/rtl8188eu/include/rtl8188e_recv.h +0 -1
@@ -56,7 +56,6 @@ enum rx_packet_type { };#define INTERRUPT_MSG_FORMAT_LEN 60 -void rtl8188eu_init_recvbuf (struct adapter *padapter,struct recv_buf *buf);s32 rtl8188eu_init_recv_priv (struct adapter *padapter);void rtl8188eu_free_recv_priv (struct adapter *padapter);void rtl8188eu_recv_hdl (struct adapter *padapter,struct recv_buf *precvbuf);
Signature · 1 line
1.7.10.4
PATCH 15/15 staging: rtl8188eu: Remove 'u8 *pbuf' from struct recv_buf
In reply to navin patidarInstead of using pbuf to pass sbk data pointer to usb_fill_bulk_urb(), we can use precvbuf->pskb->data to do that.
--- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 5 +---- drivers/staging/rtl8188eu/include/rtw_recv.h | 1 - drivers/staging/rtl8188eu/os_dep/recv_linux.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -4
@@ -612,10 +612,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) tmpaddr = (size_t )precvbuf->pskb->data; alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 );skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); - - precvbuf->pbuf = precvbuf->pskb->data; }else {/* reuse skb */ - precvbuf->pbuf = precvbuf->pskb->data; precvbuf->reuse = false; }
@@ -627,7 +624,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) pipe =ffaddr2pipehdl (pdvobj, addr);usb_fill_bulk_urb (purb, pusbd, pipe, - precvbuf->pbuf, + precvbuf->pskb->data,MAX_RECVBUF_SZ , usb_read_port_complete, precvbuf);/* context is precvbuf */
drivers/staging/rtl8188eu/include/rtw_recv.h +0 -1
@@ -236,7 +236,6 @@ struct sta_recv_priv {struct recv_buf {struct adapter *adapter; -u8 *pbuf;struct urb *purb;struct sk_buff *pskb;u8 reuse;
drivers/staging/rtl8188eu/os_dep/recv_linux.c +0 -1
@@ -60,7 +60,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, res = _FAIL; precvbuf->pskb =NULL ; precvbuf->reuse = false; - precvbuf->pbuf =NULL ;return res; }
Signature · 1 line
1.7.10.4