* [PATCH v2 1/3] staging: rtl8712: Fix Alignment of open parenthesis [not found] <cover.1572121059.git.cristianenavescardoso09@gmail.com> @ 2019-10-26 20:27 ` Cristiane Naves 2019-10-26 20:32 ` [Outreachy kernel] " Julia Lawall 2019-10-26 20:29 ` [PATCH v2 2/3] staging: rtl8712: Remove unnecessary parentheses Cristiane Naves 2019-10-26 20:31 ` [PATCH v2 3/3] staging: rtl8712: Remove lines before a close brace Cristiane Naves 2 siblings, 1 reply; 4+ messages in thread From: Cristiane Naves @ 2019-10-26 20:27 UTC (permalink / raw) To: outreachy-kernel Cc: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman, devel, linux-kernel Fix alignment should match open parenthesis. Issue found by checkpatch. Signed-off-by: Cristiane Naves <cristianenavescardoso09@gmail.com> --- drivers/staging/rtl8712/rtl8712_recv.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c index af12c16..12a3c64 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.c +++ b/drivers/staging/rtl8712/rtl8712_recv.c @@ -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,7 +379,7 @@ 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) && + ((!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 @@ -387,18 +387,18 @@ static void amsdu_to_msdu(struct _adapter *padapter, union recv_frame *prframe) */ 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; @@ -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; -- 2.7.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH v2 1/3] staging: rtl8712: Fix Alignment of open parenthesis 2019-10-26 20:27 ` [PATCH v2 1/3] staging: rtl8712: Fix Alignment of open parenthesis Cristiane Naves @ 2019-10-26 20:32 ` Julia Lawall 0 siblings, 0 replies; 4+ messages in thread From: Julia Lawall @ 2019-10-26 20:32 UTC (permalink / raw) To: Cristiane Naves Cc: outreachy-kernel, Larry Finger, Florian Schilhabel, Greg Kroah-Hartman, devel, linux-kernel On Sat, 26 Oct 2019, Cristiane Naves wrote: > Fix alignment should match open parenthesis. Issue found by checkpatch. > > Signed-off-by: Cristiane Naves <cristianenavescardoso09@gmail.com> > --- > drivers/staging/rtl8712/rtl8712_recv.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c > index af12c16..12a3c64 100644 > --- a/drivers/staging/rtl8712/rtl8712_recv.c > +++ b/drivers/staging/rtl8712/rtl8712_recv.c > @@ -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,7 +379,7 @@ 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) && > + ((!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))) { I have the impression that the alignment is not really optimal for reading here. It is hard to see what is the argument of which operator. It looks like at least there are some parentheses that eth_type should be aligned with the right side of as well. julia > /* remove RFC1042 or Bridge-Tunnel encapsulation and > @@ -387,18 +387,18 @@ static void amsdu_to_msdu(struct _adapter *padapter, union recv_frame *prframe) > */ > 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; > @@ -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; > -- > 2.7.4 > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/c9987f6ee311c7356a9f963439d37e4a9696f8eb.1572121059.git.cristianenavescardoso09%40gmail.com. > ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/3] staging: rtl8712: Remove unnecessary parentheses. [not found] <cover.1572121059.git.cristianenavescardoso09@gmail.com> 2019-10-26 20:27 ` [PATCH v2 1/3] staging: rtl8712: Fix Alignment of open parenthesis Cristiane Naves @ 2019-10-26 20:29 ` Cristiane Naves 2019-10-26 20:31 ` [PATCH v2 3/3] staging: rtl8712: Remove lines before a close brace Cristiane Naves 2 siblings, 0 replies; 4+ messages in thread From: Cristiane Naves @ 2019-10-26 20:29 UTC (permalink / raw) To: outreachy-kernel Cc: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman, devel, linux-kernel Remove unnecessary parentheses. Issue suggested by Joe Perches <joe@perches.com>. Signed-off-by: Cristiane Naves <cristianenavescardoso09@gmail.com> --- drivers/staging/rtl8712/rtl8712_recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c index 12a3c64..c567a16 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.c +++ b/drivers/staging/rtl8712/rtl8712_recv.c @@ -61,7 +61,7 @@ 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; -- 2.7.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 3/3] staging: rtl8712: Remove lines before a close brace [not found] <cover.1572121059.git.cristianenavescardoso09@gmail.com> 2019-10-26 20:27 ` [PATCH v2 1/3] staging: rtl8712: Fix Alignment of open parenthesis Cristiane Naves 2019-10-26 20:29 ` [PATCH v2 2/3] staging: rtl8712: Remove unnecessary parentheses Cristiane Naves @ 2019-10-26 20:31 ` Cristiane Naves 2 siblings, 0 replies; 4+ messages in thread From: Cristiane Naves @ 2019-10-26 20:31 UTC (permalink / raw) To: outreachy-kernel Cc: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman, devel, linux-kernel Fix Blank lines aren't necessary before a close brace '}'. Issue found by checkpatch. Signed-off-by: Cristiane Naves <cristianenavescardoso09@gmail.com> --- drivers/staging/rtl8712/rtl8712_recv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c index c567a16..b7d0ea0 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.c +++ b/drivers/staging/rtl8712/rtl8712_recv.c @@ -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, -- 2.7.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-26 20:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1572121059.git.cristianenavescardoso09@gmail.com>
2019-10-26 20:27 ` [PATCH v2 1/3] staging: rtl8712: Fix Alignment of open parenthesis Cristiane Naves
2019-10-26 20:32 ` [Outreachy kernel] " Julia Lawall
2019-10-26 20:29 ` [PATCH v2 2/3] staging: rtl8712: Remove unnecessary parentheses Cristiane Naves
2019-10-26 20:31 ` [PATCH v2 3/3] staging: rtl8712: Remove lines before a close brace Cristiane Naves
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®