Cleanup in rtl8712
v4 cover Cleanup in rtl8712
Cleanup in rtl8712
Changes in v2:
- Arranging conflict between author name and signed-off-by.
- Remove unnecessary parentheses.
- Change the driver name to rtl8712.
Changes in v3:
- Change alignment of eth_type.
- Change alignment of SN_EQUAL.
- Remove commit of unneeded parentheses.
Changes in v4:
- Fixing misplaced parentheses of previous version.
Cristiane Naves (2):
staging: rtl8712: Fix Alignment of open parenthesis
staging: rtl8712: Remove lines before a close brace
drivers/staging/rtl8712/rtl8712_recv.c | 38 ++++++++++++++++------------------ 1 file changed, 18 insertions(+), 20 deletions(-)
Signature · 1 line
2.7.4
PATCH v4 1/2 staging: rtl8712: Fix Alignment of open parenthesis
Fix alignment should match open parenthesis. Issue found by checkpatch.
--- drivers/staging/rtl8712/rtl8712_recv.c | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/staging/rtl8712/rtl8712_recv.c +18 -18
@@ -61,13 +61,13 @@ void r8712_init_recv_priv(struct recv_priv *precvpriv, precvbuf->ref_cnt =0 ; precvbuf->adapter = padapter;list_add_tail (&precvbuf->list, - &(precvpriv->free_recv_buf_queue.queue)); + &(precvpriv->free_recv_buf_queue.queue)); precvbuf++; } precvpriv->free_recv_buf_queue_cnt =NR_RECVBUFF ;tasklet_init (&precvpriv->recv_tasklet, - (void (*)(unsigned long ))recv_tasklet, - (unsigned long )padapter); + (void (*)(unsigned long ))recv_tasklet, + (unsigned long )padapter);skb_queue_head_init (&precvpriv->rx_skb_queue);skb_queue_head_init (&precvpriv->free_recv_skb_queue);
@@ -140,7 +140,7 @@ void r8712_free_recvframe(union recv_frame *precvframe, }static void update_recvframe_attrib_from_recvstat (struct rx_pkt_attrib *pattrib, -struct recv_stat *prxstat) +struct recv_stat *prxstat) {u16 drvinfo_sz;
@@ -177,7 +177,7 @@ static void update_recvframe_attrib_from_recvstat(struct rx_pkt_attrib *pattrib,/*perform defrag*/ static union recv_frame *recvframe_defrag (struct _adapter *adapter, -struct __queue *defrag_q) +struct __queue *defrag_q) {struct list_head *plist, *phead;u8 wlanhdr_offset;
@@ -379,26 +379,26 @@ static void amsdu_to_msdu(struct _adapter *padapter, union recv_frame *prframe)/* convert hdr + possible LLC headers into Ethernet header */ eth_type = (sub_skb->data[6 ] <<8 ) | sub_skb->data[7 ];if (sub_skb->len >=8 && - ((!memcmp (sub_skb->data, rfc1042_header,SNAP_SIZE ) && - eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || - !memcmp (sub_skb->data, bridge_tunnel_header,SNAP_SIZE ))) { + ((!memcmp (sub_skb->data, rfc1042_header,SNAP_SIZE ) && + eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || + !memcmp (sub_skb->data, bridge_tunnel_header,SNAP_SIZE ))) {/* remove RFC1042 or Bridge-Tunnel encapsulation and * replace EtherType */ skb_pull (sub_skb,SNAP_SIZE );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->src, -ETH_ALEN ); +ETH_ALEN );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->dst, -ETH_ALEN ); +ETH_ALEN ); }else {__be16 len;/* Leave Ethernet header part of hdr and full payload */ len =htons (sub_skb->len);memcpy (skb_push (sub_skb,2 ), &len,2 );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->src, -ETH_ALEN ); +ETH_ALEN );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->dst, -ETH_ALEN ); +ETH_ALEN ); }/* Indicate the packets to upper layer */ if (sub_skb) {
@@ -472,7 +472,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, }static int enqueue_reorder_recvframe (struct recv_reorder_ctrl *preorder_ctrl, -union recv_frame *prframe) +union recv_frame *prframe) {struct list_head *phead, *plist;union recv_frame *pnextrframe;
@@ -499,8 +499,8 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, }int r8712_recv_indicatepkts_in_order (struct _adapter *padapter, -struct recv_reorder_ctrl *preorder_ctrl, -int bforced) +struct recv_reorder_ctrl *preorder_ctrl, +int bforced) {struct list_head *phead, *plist;union recv_frame *prframe;
@@ -530,7 +530,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, plist = plist->next;list_del_init (&(prframe->u.hdr.list));if (SN_EQUAL (preorder_ctrl->indicate_seq, - pattrib->seq_num)) + pattrib->seq_num)) preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq +1 ) %4096 ;/*indicate this recv_frame*/
@@ -555,7 +555,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, }static int recv_indicatepkt_reorder (struct _adapter *padapter, -union recv_frame *prframe) +union recv_frame *prframe) {unsigned long irql;struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
@@ -624,7 +624,7 @@ void r8712_reordering_ctrl_timeout_handler(void *pcontext) }static int r8712_process_recv_indicatepkts (struct _adapter *padapter, -union recv_frame *prframe) +union recv_frame *prframe) {int retval = _SUCCESS;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
Signature · 1 line
2.7.4
PATCH v4 2/2 staging: rtl8712: Remove lines before a close brace
In reply to Cristiane NavesFix Blank lines aren't necessary before a close brace '}'. Issue found by checkpatch.
--- drivers/staging/rtl8712/rtl8712_recv.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8712/rtl8712_recv.c +0 -2
@@ -289,7 +289,6 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,r8712_free_recvframe (precv_frame, pfree_recv_queue); prtnframe =NULL ; } - }if ((ismfrag ==0 ) && (fragnum !=0 )) {/* the last fragment frame
@@ -438,7 +437,6 @@ void r8712_rxcmd_event_hdl(struct _adapter *padapter, void *prxcmdbuf)r8712_event_handle (padapter, (__le32 *)poffset); poffset += (cmd_len +8 );/*8 bytes alignment*/ }while (le32_to_cpu (voffset) &BIT (31 )); - } static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl,
Signature · 1 line
2.7.4
Greg Kroah-Hartman
maintainerRe: [PATCH v4 2/2] staging: rtl8712: Remove lines before a close brace
Quoted 7 lines · Cristiane Naves
Fix Blank lines aren't necessary before a close brace '}'. Issue found by checkpatch.
Signed-off-by Cristiane Naves <[email protected]>--- drivers/staging/rtl8712/rtl8712_recv.c | 2 -- 1 file changed, 2 deletions(-)
This patch did not apply to my tree, it was already present.
thanks,
greg k-h