driverdev-devel.linuxdriverproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging/rtl8188eu: fix line length exceeds 100 columns
@ 2020-10-20 15:17 Elena Afanasova
  2020-10-21  4:26 ` [Outreachy kernel] " Vaishali Thakkar
  2020-10-27 12:27 ` Dan Carpenter
  0 siblings, 2 replies; 3+ messages in thread
From: Elena Afanasova @ 2020-10-20 15:17 UTC (permalink / raw)
  To: gregkh; +Cc: devel, outreachy-kernel, Elena Afanasova

Reported by checkpatch.pl

Signed-off-by: Elena Afanasova <eafanasova@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_xmit.c | 118 +++++++++++++++-------
 1 file changed, 81 insertions(+), 37 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index 317355f830cb..51769f2ca910 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -44,7 +44,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
 	u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
 	u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
 
-	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
+	/*  We don't need to memset padapter->XXX to zero,
+	 *  because adapter is allocated by vzalloc().
+	 */
 
 	spin_lock_init(&pxmitpriv->lock);
 
@@ -127,7 +129,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
 		res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
 		if (res == _FAIL) {
 			msleep(10);
-			res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
+			res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ +
+									XMITBUF_ALIGN_SZ));
 			if (res == _FAIL)
 				goto exit;
 		}
@@ -441,7 +444,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 				    ((tmp[21] == 67) && (tmp[23] == 68))) {
 					/*  68 : UDP BOOTP client */
 					/*  67 : UDP BOOTP server */
-					RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====================== %s: get DHCP Packet\n", __func__));
+					RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+						 ("====================== %s: get DHCP Packet\n",
+						 __func__));
 					/*  Use low rate to send DHCP packet. */
 					pattrib->dhcp_pkt = 1;
 				}
@@ -455,7 +460,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 		rtw_set_scan_deny(padapter, 3000);
 
 	/*  If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
-	if ((pattrib->ether_type == ETH_P_ARP) || (pattrib->ether_type == ETH_P_PAE) || (pattrib->dhcp_pkt == 1))
+	if ((pattrib->ether_type == ETH_P_ARP) ||
+	    (pattrib->ether_type == ETH_P_PAE) ||
+	    (pattrib->dhcp_pkt == 1))
 		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
 
 	mcast = is_multicast_ether_addr(pattrib->ra);
@@ -466,7 +473,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 	} else {
 		psta = rtw_get_stainfo(pstapriv, pattrib->ra);
 		if (!psta) { /*  if we cannot get psta => drrp the pkt */
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra: %pM\n", (pattrib->ra)));
+			RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_,
+				 ("\nupdate_attrib => get sta_info fail, ra: %pM\n",
+				 (pattrib->ra)));
 			res = _FAIL;
 			goto exit;
 		} else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) &&
@@ -482,7 +491,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 		pattrib->psta = psta;
 	} else {
 		/*  if we cannot get psta => drop the pkt */
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n", (pattrib->ra)));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_,
+			 ("\nupdate_attrib => get sta_info fail, ra:%pM\n",
+			 (pattrib->ra)));
 		res = _FAIL;
 		goto exit;
 	}
@@ -507,7 +518,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 	}
 
 	if (psta->ieee8021x_blocked) {
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\n psta->ieee8021x_blocked == true\n"));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+			 ("\n psta->ieee8021x_blocked == true\n"));
 
 		pattrib->encrypt = 0;
 
@@ -556,7 +568,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 		}
 		break;
 	case _AES_:
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("pattrib->encrypt=%d (_AES_)\n", pattrib->encrypt));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
+			 ("pattrib->encrypt=%d (_AES_)\n", pattrib->encrypt));
 		pattrib->iv_len = 8;
 		pattrib->icv_len = 8;
 		break;
@@ -647,7 +660,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 			for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
 				payload = (u8 *)round_up((size_t)(payload), 4);
 				RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
-					 ("=== curfragnum=%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n",
+					 ("curfrnum=%d: %.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x\n",
 					 curfragnum, *payload, *(payload + 1),
 					 *(payload + 2), *(payload + 3),
 					 *(payload + 4), *(payload + 5),
@@ -673,21 +686,28 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 						  pattrib->icv_len : 0);
 					rtw_secmicappend(&micdata, payload, length);
 					payload += length + pattrib->icv_len;
-					RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("curfragnum=%d length=%d pattrib->icv_len=%d", curfragnum, length, pattrib->icv_len));
+					RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+						 ("curfragnum=%d length=%d pattrib->icv_len=%d",
+						 curfragnum, length, pattrib->icv_len));
 				}
 			}
 			rtw_secgetmic(&micdata, &mic[0]);
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: before add mic code!!!\n", __func__));
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: pattrib->last_txcmdsz=%d!!!\n", __func__, pattrib->last_txcmdsz));
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: mic[0]=0x%.2x , mic[1]=0x%.2x , mic[2]= 0x%.2x, mic[3]=0x%.2x\n\
-  mic[4]= 0x%.2x , mic[5]= 0x%.2x , mic[6]= 0x%.2x , mic[7]= 0x%.2x !!!!\n",
-				__func__, mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]));
+			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+				 ("%s: before add mic code!!!\n", __func__));
+			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+				 ("%s: pattrib->last_txcmdsz=%d!!!\n",
+				 __func__, pattrib->last_txcmdsz));
+			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+				 ("%s: mic: %.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x !!!!\n",
+				 __func__, mic[0], mic[1], mic[2], mic[3], mic[4], mic[5],
+				 mic[6], mic[7]));
 			/* add mic code  and add the mic code length in last_txcmdsz */
 
 			memcpy(payload, &mic[0], 8);
 			pattrib->last_txcmdsz += 8;
 
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("\n ======== last pkt ========\n"));
+			RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
+				 ("\n ======== last pkt ========\n"));
 			payload -= pattrib->last_txcmdsz + 8;
 			for (curfragnum = 0; curfragnum < pattrib->last_txcmdsz; curfragnum += 8)
 				RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
@@ -697,7 +717,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 					 *(payload + curfragnum + 4), *(payload + curfragnum + 5),
 					 *(payload + curfragnum + 6), *(payload + curfragnum + 7)));
 			} else {
-				RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: rtw_get_stainfo==NULL!!!\n", __func__));
+				RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+					 ("%s: rtw_get_stainfo==NULL!!!\n", __func__));
 			}
 	}
 
@@ -787,7 +808,9 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
 			if (psta && psta->qos_option)
 				qos_option = true;
 		} else {
-			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv)));
+			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+				 ("fw_state:%x is not allowed to xmit frame\n",
+				 get_fwstate(pmlmepriv)));
 			res = _FAIL;
 			goto exit;
 		}
@@ -836,11 +859,13 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
 				if (SN_LESS(pattrib->seqnum, tx_seq)) {
 					pattrib->ampdu_en = false;/* AGG BK */
 				} else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
-					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq + 1) & 0xfff;
+					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
+									(tx_seq + 1) & 0xfff;
 
 					pattrib->ampdu_en = true;/* AGG EN */
 				} else {
-					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum + 1) & 0xfff;
+					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
+								(pattrib->seqnum + 1) & 0xfff;
 					pattrib->ampdu_en = true;/* AGG EN */
 				}
 			}
@@ -904,7 +929,8 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pat
  * 6. apply sw-encrypt, if necessary.
  *
  */
-s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
+s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt,
+			   struct xmit_frame *pxmitframe)
 {
 	s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
 	size_t addr;
@@ -935,7 +961,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 	mem_start = pbuf_start +	hw_hdr_offset;
 
 	if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) {
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+			 ("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__));
 		DBG_88E("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__);
 		res = _FAIL;
 		goto exit;
@@ -1016,15 +1043,18 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 		if (mcast || remainder == 0) {
 			pattrib->nr_frags = frg_inx;
 
-			pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
-						((pattrib->bswenc) ? pattrib->icv_len : 0) + mem_sz;
+			pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
+						((pattrib->nr_frags == 1) ? llc_sz : 0) +
+						((pattrib->bswenc) ? pattrib->icv_len : 0) +
+						mem_sz;
 
 			ClearMFrag(mem_start);
 
 			break;
 		}
 
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+			 ("%s: There're still something in packet!\n", __func__));
 
 		addr = (size_t)(pframe);
 
@@ -1036,7 +1066,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 	rtl88eu_mon_xmit_hook(padapter->pmondev, pxmitframe, frg_len);
 
 	if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) {
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+			 ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"));
 		DBG_88E("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n");
 		res = _FAIL;
 		goto exit;
@@ -1297,7 +1328,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
 	struct sk_buff *pndis_pkt = NULL;
 
 	if (!pxmitframe) {
-		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== %s:pxmitframe == NULL!!!!!!!!!!\n", __func__));
+		RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
+			 ("====== %s:pxmitframe == NULL!!!!!!!!!!\n", __func__));
 		goto exit;
 	}
 
@@ -1313,7 +1345,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
 	list_add_tail(&pxmitframe->list, get_list_head(pfree_xmit_queue));
 
 	pxmitpriv->free_xmitframe_cnt++;
-	RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("%s:free_xmitframe_cnt=%d\n", __func__, pxmitpriv->free_xmitframe_cnt));
+	RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_,
+		 ("%s:free_xmitframe_cnt=%d\n", __func__, pxmitpriv->free_xmitframe_cnt));
 
 	spin_unlock_bh(&pfree_xmit_queue->lock);
 
@@ -1355,7 +1388,9 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram
 	return _SUCCESS;
 }
 
-static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, struct __queue *pframe_queue)
+static struct xmit_frame *
+dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit,
+		      struct tx_servq *ptxservq, struct __queue *pframe_queue)
 {
 	struct list_head *xmitframe_plist, *xmitframe_phead;
 	struct	xmit_frame	*pxmitframe = NULL;
@@ -1375,7 +1410,8 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str
 	return pxmitframe;
 }
 
-struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, int entry)
+struct xmit_frame *
+rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, int entry)
 {
 	struct list_head *sta_plist, *sta_phead;
 	struct hw_xmit *phwxmit;
@@ -1408,13 +1444,18 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
 
 			pframe_queue = &ptxservq->sta_pending;
 
-			pxmitframe = dequeue_one_xmitframe(pxmitpriv, phwxmit, ptxservq, pframe_queue);
+			pxmitframe = dequeue_one_xmitframe(pxmitpriv,
+							   phwxmit,
+							   ptxservq,
+							   pframe_queue);
 
 			if (pxmitframe) {
 				phwxmit->accnt--;
 
-				/* Remove sta node when there are no pending packets. */
-				if (list_empty(&pframe_queue->queue)) /* must be done after get_next and before break */
+				/* Remove sta node when there are no pending packets.
+				 * must be done after get_next and before break
+				 */
+				if (list_empty(&pframe_queue->queue))
 					list_del_init(&ptxservq->tx_pending);
 				goto exit;
 			}
@@ -1670,8 +1711,8 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
 			pstapriv->tim_bitmap |= BIT(0);/*  */
 			pstapriv->sta_dz_bitmap |= BIT(0);
 
-			update_beacon(padapter, WLAN_EID_TIM, NULL, false);/* tx bc/mc packets after update bcn */
-
+			/* tx bc/mc packets after update bcn */
+			update_beacon(padapter, WLAN_EID_TIM, NULL, false);
 			ret = true;
 		}
 
@@ -1733,7 +1774,9 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
 	return ret;
 }
 
-static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
+static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,
+						 struct sta_info *psta,
+						 struct __queue *pframequeue)
 {
 	struct list_head *plist, *phead;
 	u8	ac_index;
@@ -1754,7 +1797,8 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc
 
 		pattrib = &pxmitframe->attrib;
 
-		ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index));
+		ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority,
+					       (u8 *)(&ac_index));
 
 		ptxservq->qcnt--;
 		phwxmits[ac_index].accnt--;
-- 
2.25.1

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Outreachy kernel] [PATCH] staging/rtl8188eu: fix line length exceeds 100 columns
  2020-10-20 15:17 [PATCH] staging/rtl8188eu: fix line length exceeds 100 columns Elena Afanasova
@ 2020-10-21  4:26 ` Vaishali Thakkar
  2020-10-27 12:27 ` Dan Carpenter
  1 sibling, 0 replies; 3+ messages in thread
From: Vaishali Thakkar @ 2020-10-21  4:26 UTC (permalink / raw)
  To: Elena Afanasova; +Cc: devel, Greg KH, Outreachy

On Tue, Oct 20, 2020 at 8:56 PM Elena Afanasova <eafanasova@gmail.com> wrote:
>
> Reported by checkpatch.pl

Hi Elena,

Thanks for your patches. Your commit log should mention
why are you doing certain changes. Above commit log
doesn't give reviewer/maintainer an idea about what are
you fixing and why that change is necessary.

Also, avoid using the word 'fix' in the subject lines. Rather
write about the change you're doing in this patch. For
example, you can write something like 'rearrange
lines exceeding 100 columns' for this patch.

Above review applies for all the patches you've sent so far. :)

> Signed-off-by: Elena Afanasova <eafanasova@gmail.com>
> ---
>  drivers/staging/rtl8188eu/core/rtw_xmit.c | 118 +++++++++++++++-------
>  1 file changed, 81 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> index 317355f830cb..51769f2ca910 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> @@ -44,7 +44,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
>         u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
>         u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
>
> -       /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
> +       /*  We don't need to memset padapter->XXX to zero,
> +        *  because adapter is allocated by vzalloc().
> +        */
>
>         spin_lock_init(&pxmitpriv->lock);
>
> @@ -127,7 +129,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
>                 res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
>                 if (res == _FAIL) {
>                         msleep(10);
> -                       res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
> +                       res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ +
> +                                                                       XMITBUF_ALIGN_SZ));
>                         if (res == _FAIL)
>                                 goto exit;
>                 }
> @@ -441,7 +444,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>                                     ((tmp[21] == 67) && (tmp[23] == 68))) {
>                                         /*  68 : UDP BOOTP client */
>                                         /*  67 : UDP BOOTP server */
> -                                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====================== %s: get DHCP Packet\n", __func__));
> +                                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                                ("====================== %s: get DHCP Packet\n",
> +                                                __func__));
>                                         /*  Use low rate to send DHCP packet. */
>                                         pattrib->dhcp_pkt = 1;
>                                 }
> @@ -455,7 +460,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>                 rtw_set_scan_deny(padapter, 3000);
>
>         /*  If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
> -       if ((pattrib->ether_type == ETH_P_ARP) || (pattrib->ether_type == ETH_P_PAE) || (pattrib->dhcp_pkt == 1))
> +       if ((pattrib->ether_type == ETH_P_ARP) ||
> +           (pattrib->ether_type == ETH_P_PAE) ||
> +           (pattrib->dhcp_pkt == 1))
>                 rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
>
>         mcast = is_multicast_ether_addr(pattrib->ra);
> @@ -466,7 +473,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>         } else {
>                 psta = rtw_get_stainfo(pstapriv, pattrib->ra);
>                 if (!psta) { /*  if we cannot get psta => drrp the pkt */
> -                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra: %pM\n", (pattrib->ra)));
> +                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_,
> +                                ("\nupdate_attrib => get sta_info fail, ra: %pM\n",
> +                                (pattrib->ra)));
>                         res = _FAIL;
>                         goto exit;
>                 } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) &&
> @@ -482,7 +491,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>                 pattrib->psta = psta;
>         } else {
>                 /*  if we cannot get psta => drop the pkt */
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n", (pattrib->ra)));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_,
> +                        ("\nupdate_attrib => get sta_info fail, ra:%pM\n",
> +                        (pattrib->ra)));
>                 res = _FAIL;
>                 goto exit;
>         }
> @@ -507,7 +518,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>         }
>
>         if (psta->ieee8021x_blocked) {
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\n psta->ieee8021x_blocked == true\n"));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                        ("\n psta->ieee8021x_blocked == true\n"));
>
>                 pattrib->encrypt = 0;
>
> @@ -556,7 +568,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>                 }
>                 break;
>         case _AES_:
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("pattrib->encrypt=%d (_AES_)\n", pattrib->encrypt));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
> +                        ("pattrib->encrypt=%d (_AES_)\n", pattrib->encrypt));
>                 pattrib->iv_len = 8;
>                 pattrib->icv_len = 8;
>                 break;
> @@ -647,7 +660,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
>                         for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
>                                 payload = (u8 *)round_up((size_t)(payload), 4);
>                                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> -                                        ("=== curfragnum=%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n",
> +                                        ("curfrnum=%d: %.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x\n",
>                                          curfragnum, *payload, *(payload + 1),
>                                          *(payload + 2), *(payload + 3),
>                                          *(payload + 4), *(payload + 5),
> @@ -673,21 +686,28 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
>                                                   pattrib->icv_len : 0);
>                                         rtw_secmicappend(&micdata, payload, length);
>                                         payload += length + pattrib->icv_len;
> -                                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("curfragnum=%d length=%d pattrib->icv_len=%d", curfragnum, length, pattrib->icv_len));
> +                                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                                ("curfragnum=%d length=%d pattrib->icv_len=%d",
> +                                                curfragnum, length, pattrib->icv_len));
>                                 }
>                         }
>                         rtw_secgetmic(&micdata, &mic[0]);
> -                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: before add mic code!!!\n", __func__));
> -                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: pattrib->last_txcmdsz=%d!!!\n", __func__, pattrib->last_txcmdsz));
> -                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: mic[0]=0x%.2x , mic[1]=0x%.2x , mic[2]= 0x%.2x, mic[3]=0x%.2x\n\
> -  mic[4]= 0x%.2x , mic[5]= 0x%.2x , mic[6]= 0x%.2x , mic[7]= 0x%.2x !!!!\n",
> -                               __func__, mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]));
> +                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                ("%s: before add mic code!!!\n", __func__));
> +                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                ("%s: pattrib->last_txcmdsz=%d!!!\n",
> +                                __func__, pattrib->last_txcmdsz));
> +                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                ("%s: mic: %.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x !!!!\n",
> +                                __func__, mic[0], mic[1], mic[2], mic[3], mic[4], mic[5],
> +                                mic[6], mic[7]));
>                         /* add mic code  and add the mic code length in last_txcmdsz */
>
>                         memcpy(payload, &mic[0], 8);
>                         pattrib->last_txcmdsz += 8;
>
> -                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("\n ======== last pkt ========\n"));
> +                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
> +                                ("\n ======== last pkt ========\n"));
>                         payload -= pattrib->last_txcmdsz + 8;
>                         for (curfragnum = 0; curfragnum < pattrib->last_txcmdsz; curfragnum += 8)
>                                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
> @@ -697,7 +717,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
>                                          *(payload + curfragnum + 4), *(payload + curfragnum + 5),
>                                          *(payload + curfragnum + 6), *(payload + curfragnum + 7)));
>                         } else {
> -                               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: rtw_get_stainfo==NULL!!!\n", __func__));
> +                               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                        ("%s: rtw_get_stainfo==NULL!!!\n", __func__));
>                         }
>         }
>
> @@ -787,7 +808,9 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
>                         if (psta && psta->qos_option)
>                                 qos_option = true;
>                 } else {
> -                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv)));
> +                       RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                                ("fw_state:%x is not allowed to xmit frame\n",
> +                                get_fwstate(pmlmepriv)));
>                         res = _FAIL;
>                         goto exit;
>                 }
> @@ -836,11 +859,13 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
>                                 if (SN_LESS(pattrib->seqnum, tx_seq)) {
>                                         pattrib->ampdu_en = false;/* AGG BK */
>                                 } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
> -                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq + 1) & 0xfff;
> +                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
> +                                                                       (tx_seq + 1) & 0xfff;
>
>                                         pattrib->ampdu_en = true;/* AGG EN */
>                                 } else {
> -                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum + 1) & 0xfff;
> +                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
> +                                                               (pattrib->seqnum + 1) & 0xfff;
>                                         pattrib->ampdu_en = true;/* AGG EN */
>                                 }
>                         }
> @@ -904,7 +929,8 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pat
>   * 6. apply sw-encrypt, if necessary.
>   *
>   */
> -s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
> +s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt,
> +                          struct xmit_frame *pxmitframe)
>  {
>         s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
>         size_t addr;
> @@ -935,7 +961,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
>         mem_start = pbuf_start +        hw_hdr_offset;
>
>         if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) {
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                        ("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__));
>                 DBG_88E("%s: rtw_make_wlanhdr fail; drop pkt\n", __func__);
>                 res = _FAIL;
>                 goto exit;
> @@ -1016,15 +1043,18 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
>                 if (mcast || remainder == 0) {
>                         pattrib->nr_frags = frg_inx;
>
> -                       pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
> -                                               ((pattrib->bswenc) ? pattrib->icv_len : 0) + mem_sz;
> +                       pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
> +                                               ((pattrib->nr_frags == 1) ? llc_sz : 0) +
> +                                               ((pattrib->bswenc) ? pattrib->icv_len : 0) +
> +                                               mem_sz;
>
>                         ClearMFrag(mem_start);
>
>                         break;
>                 }
>
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                        ("%s: There're still something in packet!\n", __func__));
>
>                 addr = (size_t)(pframe);
>
> @@ -1036,7 +1066,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
>         rtl88eu_mon_xmit_hook(padapter->pmondev, pxmitframe, frg_len);
>
>         if (xmitframe_addmic(padapter, pxmitframe) == _FAIL) {
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                        ("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n"));
>                 DBG_88E("xmitframe_addmic(padapter, pxmitframe) == _FAIL\n");
>                 res = _FAIL;
>                 goto exit;
> @@ -1297,7 +1328,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
>         struct sk_buff *pndis_pkt = NULL;
>
>         if (!pxmitframe) {
> -               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====== %s:pxmitframe == NULL!!!!!!!!!!\n", __func__));
> +               RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +                        ("====== %s:pxmitframe == NULL!!!!!!!!!!\n", __func__));
>                 goto exit;
>         }
>
> @@ -1313,7 +1345,8 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
>         list_add_tail(&pxmitframe->list, get_list_head(pfree_xmit_queue));
>
>         pxmitpriv->free_xmitframe_cnt++;
> -       RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_, ("%s:free_xmitframe_cnt=%d\n", __func__, pxmitpriv->free_xmitframe_cnt));
> +       RT_TRACE(_module_rtl871x_xmit_c_, _drv_debug_,
> +                ("%s:free_xmitframe_cnt=%d\n", __func__, pxmitpriv->free_xmitframe_cnt));
>
>         spin_unlock_bh(&pfree_xmit_queue->lock);
>
> @@ -1355,7 +1388,9 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram
>         return _SUCCESS;
>  }
>
> -static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, struct __queue *pframe_queue)
> +static struct xmit_frame *
> +dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit,
> +                     struct tx_servq *ptxservq, struct __queue *pframe_queue)

For the checkpatch suggestions like lines exceeding certain
characters, it might be a good idea to not send a patch with
so many changes all over the places. Rather you can batch
them into a patch(s) where you're improving the readability
of the similar kind of patterns/lines. For example, in the above
case, you can have a patch where you're just handling those
RT_TRACE lines.

>  {
>         struct list_head *xmitframe_plist, *xmitframe_phead;
>         struct  xmit_frame      *pxmitframe = NULL;
> @@ -1375,7 +1410,8 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str
>         return pxmitframe;
>  }
>
> -struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, int entry)
> +struct xmit_frame *
> +rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, int entry)
>  {
>         struct list_head *sta_plist, *sta_phead;
>         struct hw_xmit *phwxmit;
> @@ -1408,13 +1444,18 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
>
>                         pframe_queue = &ptxservq->sta_pending;
>
> -                       pxmitframe = dequeue_one_xmitframe(pxmitpriv, phwxmit, ptxservq, pframe_queue);
> +                       pxmitframe = dequeue_one_xmitframe(pxmitpriv,
> +                                                          phwxmit,
> +                                                          ptxservq,
> +                                                          pframe_queue);
>
>                         if (pxmitframe) {
>                                 phwxmit->accnt--;
>
> -                               /* Remove sta node when there are no pending packets. */
> -                               if (list_empty(&pframe_queue->queue)) /* must be done after get_next and before break */
> +                               /* Remove sta node when there are no pending packets.
> +                                * must be done after get_next and before break
> +                                */
> +                               if (list_empty(&pframe_queue->queue))
>                                         list_del_init(&ptxservq->tx_pending);
>                                 goto exit;
>                         }
> @@ -1670,8 +1711,8 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
>                         pstapriv->tim_bitmap |= BIT(0);/*  */
>                         pstapriv->sta_dz_bitmap |= BIT(0);
>
> -                       update_beacon(padapter, WLAN_EID_TIM, NULL, false);/* tx bc/mc packets after update bcn */
> -
> +                       /* tx bc/mc packets after update bcn */
> +                       update_beacon(padapter, WLAN_EID_TIM, NULL, false);
>                         ret = true;
>                 }
>
> @@ -1733,7 +1774,9 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
>         return ret;
>  }
>
> -static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
> +static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,
> +                                                struct sta_info *psta,
> +                                                struct __queue *pframequeue)
>  {
>         struct list_head *plist, *phead;
>         u8      ac_index;
> @@ -1754,7 +1797,8 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc
>
>                 pattrib = &pxmitframe->attrib;
>
> -               ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index));
> +               ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority,
> +                                              (u8 *)(&ac_index));
>
>                 ptxservq->qcnt--;
>                 phwxmits[ac_index].accnt--;
> --
> 2.25.1
>
> --
> 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/20201020151748.35937-1-eafanasova%40gmail.com.



-- 
Vaishali


-- 
Vaishali
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] staging/rtl8188eu: fix line length exceeds 100 columns
  2020-10-20 15:17 [PATCH] staging/rtl8188eu: fix line length exceeds 100 columns Elena Afanasova
  2020-10-21  4:26 ` [Outreachy kernel] " Vaishali Thakkar
@ 2020-10-27 12:27 ` Dan Carpenter
  1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-10-27 12:27 UTC (permalink / raw)
  To: Elena Afanasova; +Cc: devel, gregkh, outreachy-kernel

On Tue, Oct 20, 2020 at 08:17:48AM -0700, Elena Afanasova wrote:
> Reported by checkpatch.pl
> 

If I were trying to clean up this driver I would probably take a
different approach.

Just send a patch that introduces line breaks for RT_TRACE() printks.
The RT_TRACE() printks are super ugly, and if you add newlines to them,
it can't make it worse than it already is.  Do not change the RT_TRACE()
output.

-                                        ("=== curfragnum=%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n",
+                                        ("curfrnum=%d: %.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x-%.2x\n",

Your change here is an improvement but it requires thinking and
reviewers don't want to look at RT_TRACE().  Make your patches as
uncontroversial as possible.

Then for the other things there are some changes which are good, but in
other places the correct thing is to introduce new functions.  So what
I would want instead is a series of patches which do small clean ups
which make the code obviously better, and are not just to make checkpatch
happy.

> Signed-off-by: Elena Afanasova <eafanasova@gmail.com>
> ---
>  drivers/staging/rtl8188eu/core/rtw_xmit.c | 118 +++++++++++++++-------
>  1 file changed, 81 insertions(+), 37 deletions(-)
> 
> diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> index 317355f830cb..51769f2ca910 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
> @@ -44,7 +44,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
>  	u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
>  	u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
>  
> -	/*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
> +	/*  We don't need to memset padapter->XXX to zero,
> +	 *  because adapter is allocated by vzalloc().
> +	 */

This comment is totally pointless.  Kernel devs are expected to
understand what the "z" in vzalloc() means.  Just delete it.

>  
>  	spin_lock_init(&pxmitpriv->lock);
>  
> @@ -127,7 +129,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
>  		res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
>  		if (res == _FAIL) {
>  			msleep(10);
> -			res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
> +			res = rtw_os_xmit_resource_alloc(pxmitbuf, (MAX_XMITBUF_SZ +
> +									XMITBUF_ALIGN_SZ));

Align it like this:

			res = rtw_os_xmit_resource_alloc(pxmitbuf,
							 MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ);

The rtw_os_xmit_resource_alloc() function is poorly named.


>  			if (res == _FAIL)
>  				goto exit;
>  		}
> @@ -441,7 +444,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>  				    ((tmp[21] == 67) && (tmp[23] == 68))) {
>  					/*  68 : UDP BOOTP client */
>  					/*  67 : UDP BOOTP server */
> -					RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("====================== %s: get DHCP Packet\n", __func__));
> +					RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
> +						 ("====================== %s: get DHCP Packet\n",
> +						 __func__));

What does this message really mean?  The "===" characters don't add
anything.  It's probably better to just delete this printk.

>  					/*  Use low rate to send DHCP packet. */
>  					pattrib->dhcp_pkt = 1;
>  				}
> @@ -455,7 +460,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>  		rtw_set_scan_deny(padapter, 3000);
>  
>  	/*  If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
> -	if ((pattrib->ether_type == ETH_P_ARP) || (pattrib->ether_type == ETH_P_PAE) || (pattrib->dhcp_pkt == 1))
> +	if ((pattrib->ether_type == ETH_P_ARP) ||
> +	    (pattrib->ether_type == ETH_P_PAE) ||
> +	    (pattrib->dhcp_pkt == 1))

This change is good.

>  		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
>  
>  	mcast = is_multicast_ether_addr(pattrib->ra);
> @@ -466,7 +473,9 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
>  	} else {
>  		psta = rtw_get_stainfo(pstapriv, pattrib->ra);
>  		if (!psta) { /*  if we cannot get psta => drrp the pkt */
> -			RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra: %pM\n", (pattrib->ra)));
> +			RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_,
> +				 ("\nupdate_attrib => get sta_info fail, ra: %pM\n",
> +				 (pattrib->ra)));

I guess this is fine.  All the RT_TRACE output just looks so terrible...
Why does it sometimes have a newline at the start and sometimes not?
In one place you improved the RT_TRACE() output which is good but
probably should be done in a separate patch...

Anyway, I'm done thinking about RT_TRACE() because it makes me want to
poke out my own eyeballs like the really gruesome scene from Game of
Throwns where the guys head explodes.

[ snip ]

> @@ -836,11 +859,13 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
>  				if (SN_LESS(pattrib->seqnum, tx_seq)) {
>  					pattrib->ampdu_en = false;/* AGG BK */
>  				} else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
> -					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq + 1) & 0xfff;
> +					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
> +									(tx_seq + 1) & 0xfff;
>  
>  					pattrib->ampdu_en = true;/* AGG EN */
>  				} else {
> -					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum + 1) & 0xfff;
> +					psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =
> +								(pattrib->seqnum + 1) & 0xfff;
>  					pattrib->ampdu_en = true;/* AGG EN */

I would argue that this is less readable (worse) than before.  The
way to fix this is to introduce new functions.

regards,
dan carpenter

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-10-27 12:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-20 15:17 [PATCH] staging/rtl8188eu: fix line length exceeds 100 columns Elena Afanasova
2020-10-21  4:26 ` [Outreachy kernel] " Vaishali Thakkar
2020-10-27 12:27 ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).