staging: rtl8723bs: os_dep: Correct long line comments and remove whitespace in code
v2 cover staging: rtl8723bs: os_dep: Correct long line comments and remove whitespace in code
Correct long line comments to match coding style of respecting 80 character per line limit.
Remove five leading whitespace characters in code line.
Please apply the patches in series.
Changes since V1
- Missed staging: rtl8723bs: os_dep: in cover letter
---
R Veera Kumar (2):
staging: rtl8723bs: os_dep: Correct long line comments
staging: rtl8723bs: os_dep: Remove whitespace characters in code line
drivers/staging/rtl8723bs/os_dep/recv_linux.c | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/2 staging: rtl8723bs: os_dep: Correct long line comments
Correct long line comments to respect 80 character per line limit.
---
Changes in v3:
- Remove extra ' ' character before comment
Changes in v2:
- Remove an extra blank line added by error
--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +20 -6
@@ -35,7 +35,8 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)for (i =0 ; i <NR_RECVFRAME ; i++) {if (precvframe->u.hdr.pkt) { -dev_kfree_skb_any (precvframe->u.hdr.pkt);/* free skb by driver */ +/* free skb by driver */ +dev_kfree_skb_any (precvframe->u.hdr.pkt); precvframe->u.hdr.pkt =NULL ; } precvframe++;
@@ -80,7 +81,10 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) && eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || !memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE))) { -/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ +/* +* 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 );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->dst,ETH_ALEN );
@@ -112,7 +116,10 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt/* DBG_871X("bmcast =%d\n", bmcast); */ if (memcmp (pattrib->dst,myid (&padapter->eeprompriv),ETH_ALEN )) { -/* DBG_871X("not ap psta =%p, addr =%pM\n", psta, pattrib->dst); */ +/* +* DBG_871X("not ap psta =%p, addr =%pM\n", +* psta, pattrib->dst); +*/ if (bmcast) { psta =rtw_get_bcmc_stainfo (padapter);
@@ -124,7 +131,10 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pktif (psta) {struct net_device *pnetdev = (struct net_device *)padapter->pnetdev; -/* DBG_871X("directly forwarding to the rtw_xmit_entry\n"); */ +/* +* DBG_871X("directly forwarding to the +* rtw_xmit_entry\n"); +*/ /* skb->ip_summed = CHECKSUM_NONE; */ pkt->dev = pnetdev;
@@ -236,7 +246,10 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *precu16 len = *(u16 *)(skb->data+ETH_HLEN +2 );/* u16 ctrl_type = *(u16*)(skb->data+ETH_HLEN+4); */ -/* DBG_871X("eth, RC: len = 0x%x, ctrl_type = 0x%x\n", len, ctrl_type); */ +/* +* DBG_871X("eth, RC: len = 0x%x, ctrl_type = 0x%x\n", +* len, ctrl_type); +*/ DBG_871X ("eth, RC: len = 0x%x\n" , len);for (i =0 ; i < len; i++)
@@ -291,7 +304,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_framertw_os_recv_indicate_pkt (padapter, skb, pattrib); - precv_frame->u.hdr.pkt =NULL ;/* pointers to NULL before rtw_free_recvframe() */ +/* pointers to NULL before rtw_free_recvframe() */ + precv_frame->u.hdr.pkt =NULL ;rtw_free_recvframe (precv_frame, pfree_recv_queue);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerRe: [PATCH v2 1/2] staging: rtl8723bs: os_dep: Correct long line comments
Quoted 40 lines · R Veera Kumar
Correct long line comments to respect 80 character per line limit.
Signed-off-by R Veera Kumar <[email protected]>---
Changes in v3:
- Remove extra ' ' character before comment
Changes in v2:
- Remove an extra blank line added by error--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-)drivers/staging/rtl8723bs/os_dep/recv_linux.c +6
-2@@ -35,7 +35,8 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)for (i =0 ; i <NR_RECVFRAME ; i++) {if (precvframe->u.hdr.pkt) { -dev_kfree_skb_any (precvframe->u.hdr.pkt);/* free skb by driver */ +/* free skb by driver */ +dev_kfree_skb_any (precvframe->u.hdr.pkt); precvframe->u.hdr.pkt =NULL ; } precvframe++;@@ -80,7 +81,10 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) && eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || !memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE))) { -/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ +/* +* 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 );memcpy (skb_push (sub_skb,ETH_ALEN ), pattrib->dst,ETH_ALEN );
drivers/staging/rtl8723bs/os_dep/recv_linux.c void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt · line 121
Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/recv_linux.c +3
-1@@ -112,7 +116,10 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt/* DBG_871X("bmcast =%d\n", bmcast); */ if (memcmp (pattrib->dst,myid (&padapter->eeprompriv),ETH_ALEN )) { -/* DBG_871X("not ap psta =%p, addr =%pM\n", psta, pattrib->dst); */ +/* +* DBG_871X("not ap psta =%p, addr =%pM\n", +* psta, pattrib->dst);
Same comments on v1 of this patch series.
PATCH v2 2/2 staging: rtl8723bs: os_dep: Remove whitespace characters in code line
In reply to R Veera KumarRemove five leading whitespace characters in code line.
--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +6 -6
@@ -79,8 +79,8 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8if (sub_skb->len >=8 && ((!memcmp (sub_skb->data, rtw_rfc1042_header,SNAP_SIZE ) && - eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || - !memcmp (sub_skb->data, rtw_bridge_tunnel_header,SNAP_SIZE ))) { + eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || + !memcmp (sub_skb->data, rtw_bridge_tunnel_header,SNAP_SIZE ))) {/* * remove RFC1042 or Bridge-Tunnel encapsulation and replace * EtherType
@@ -315,11 +315,11 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame _recv_indicatepkt_drop: -/* enqueue back to free_recv_queue */ -rtw_free_recvframe (precv_frame, pfree_recv_queue); +/* enqueue back to free_recv_queue */ +rtw_free_recvframe (precv_frame, pfree_recv_queue); -DBG_COUNTER (padapter->rx_logs.os_indicate_err); -return _FAIL; +DBG_COUNTER (padapter->rx_logs.os_indicate_err); +return _FAIL; }void rtw_init_recv_timer (struct recv_reorder_ctrl *preorder_ctrl)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerRe: [PATCH v2 2/2] staging: rtl8723bs: os_dep: Remove whitespace characters in code line
Quoted 12 lines · R Veera Kumar
Remove five leading whitespace characters in code line.
Signed-off-by R Veera Kumar <[email protected]>--- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/rtl8723bs/os_dep/recv_linux.c +0
-0
drivers/staging/rtl8723bs/os_dep/recv_linux.c _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 · line 83
Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/recv_linux.c +2
-2@@ -79,8 +79,8 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8if (sub_skb->len >=8 && ((!memcmp (sub_skb->data, rtw_rfc1042_header,SNAP_SIZE ) && - eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || - !memcmp (sub_skb->data, rtw_bridge_tunnel_header,SNAP_SIZE ))) { + eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || + !memcmp (sub_skb->data, rtw_bridge_tunnel_header,SNAP_SIZE ))) {
Again, this is just fine.