Skip to contentSkip to conversation

staging: r8188eu: remove debug code for dumping packets

PATCH New Martin Kaiser 1 participant 3 messages Mar 30, 2022 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: r8188eu: remove debug code for dumping packets

Remove the remains of debug code to print incoming and outgoing packets.

Martin Kaiser (2):
staging: r8188eu: remove the "dump rx packet" fragments
staging: r8188eu: remove the "dump tx packet" fragments

 drivers/staging/r8188eu/core/rtw_recv.c        |  4 ----
 drivers/staging/r8188eu/hal/usb_halinit.c      | 12 ------------
 drivers/staging/r8188eu/include/hal_intf.h     |  2 --
 drivers/staging/r8188eu/include/rtl8188e_hal.h |  3 ---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c   |  7 -------
 5 files changed, 28 deletions(-)
Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/2 staging: r8188eu: remove the "dump rx packet" fragments

Remove the code fragments for printing incoming packets. There's only a hal variable HAL_DEF_DBG_DUMP_RXPKT and the bDumpRxPkt component of struct hal_data_8188e.

The hal variable is set by a private ioctl, it's read in validate_recv_frame but it's not used.

All of this can be removed, there's no code to dump the packets.

---
 drivers/staging/r8188eu/core/rtw_recv.c        | 4 ----
 drivers/staging/r8188eu/hal/usb_halinit.c      | 6 ------
 drivers/staging/r8188eu/include/hal_intf.h     | 1 -
 drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 -
 drivers/staging/r8188eu/os_dep/ioctl_linux.c   | 5 +----
 5 files changed, 1 insertion(+), 16 deletions(-)
drivers/staging/r8188eu/core/rtw_recv.c +0 -4
index 62cf2df90073..476bd4f22528 100644
@@ -1060,7 +1060,6 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv
 	/* then call check if rx seq/frag. duplicated. */
 
 	int retval = _FAIL;
-	u8 bDumpRxPkt;
 	struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
 	u8 *ptr = precv_frame->rx_data;
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)precv_frame->rx_data;
@@ -1086,9 +1085,6 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv
 	pattrib->privacy = ieee80211_has_protected(hdr->frame_control);
 	pattrib->order = ieee80211_has_order(hdr->frame_control);
 
-	/* Dump rx packets */
-	GetHalDefVar8188EUsb(adapter, HAL_DEF_DBG_DUMP_RXPKT, &bDumpRxPkt);
-
 	/* We return _SUCCESS only for data frames. */
 	if (ieee80211_is_mgmt(hdr->frame_control))
 		validate_recv_mgnt_frame(adapter, precv_frame);
drivers/staging/r8188eu/hal/usb_halinit.c +0 -6
index 789ad11170b2..0b6bf84acff6 100644
@@ -1401,9 +1401,6 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 	case HAL_DEF_DBG_DM_FUNC:
 		*((u32 *)pValue) = haldata->odmpriv.SupportAbility;
 		break;
-	case HAL_DEF_DBG_DUMP_RXPKT:
-		*((u8 *)pValue) = haldata->bDumpRxPkt;
-		break;
 	case HAL_DEF_DBG_DUMP_TXPKT:
 		*((u8 *)pValue) = haldata->bDumpTxPkt;
 		break;
@@ -1436,9 +1433,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 			}
 		}
 		break;
-	case HAL_DEF_DBG_DUMP_RXPKT:
-		haldata->bDumpRxPkt = *((u8 *)pValue);
-		break;
 	case HAL_DEF_DBG_DUMP_TXPKT:
 		haldata->bDumpTxPkt = *((u8 *)pValue);
 		break;
drivers/staging/r8188eu/include/hal_intf.h +0 -1
index 6f661c4af358..8ecb49c4f038 100644
@@ -45,7 +45,6 @@ enum hw_variables {
 enum hal_def_variable {
 	HAL_DEF_IS_SUPPORT_ANT_DIV,
 	HAL_DEF_CURRENT_ANTENNA,
-	HAL_DEF_DBG_DUMP_RXPKT,/* for dbg */
 	HAL_DEF_DBG_DM_FUNC,/* for dbg */
 	HAL_DEF_DBG_DUMP_TXPKT,
 };
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -1
index 82cb4f7f4d3e..5bda353b6a41 100644
@@ -160,7 +160,6 @@ struct hal_data_8188e {
 	u8	AntDivCfg;
 	u8	TRxAntDivType;
 
-	u8	bDumpRxPkt;/* for debug */
 	u8	bDumpTxPkt;/* for debug */
 
 	u8	OutEpQueueSel;
drivers/staging/r8188eu/os_dep/ioctl_linux.c +1 -4
index eb9375b0c660..a45d60a7c19b 100644
@@ -3633,11 +3633,8 @@ static int rtw_dbg_port(struct net_device *dev,
 		case 0x09:
 			break;
 		case 0x0c:/* dump rx/tx packet */
-			if (arg == 0) {
-				SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DUMP_RXPKT, &extra_arg);
-			} else if (arg == 1) {
+			if (arg == 1)
 				SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DUMP_TXPKT, &extra_arg);
-			}
 			break;
 		case 0x15:
 			break;
Signature · 1 line
2.30.2
#2 lore raw

PATCH 2/2 staging: r8188eu: remove the "dump tx packet" fragments

In reply to Martin Kaiser

Remove the code fragments for printing outgoing packets.

There's only a hal variable HAL_DEF_DBG_DUMP_TXPKT and the bDumpTxPkt component of struct hal_data_8188e.

The hal variable is set by a private ioctl, it's never read.

---
 drivers/staging/r8188eu/hal/usb_halinit.c      | 6 ------
 drivers/staging/r8188eu/include/hal_intf.h     | 1 -
 drivers/staging/r8188eu/include/rtl8188e_hal.h | 2 --
 drivers/staging/r8188eu/os_dep/ioctl_linux.c   | 4 ----
 4 files changed, 13 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -6
index 0b6bf84acff6..2e6fe9885c16 100644
@@ -1401,9 +1401,6 @@ void GetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 	case HAL_DEF_DBG_DM_FUNC:
 		*((u32 *)pValue) = haldata->odmpriv.SupportAbility;
 		break;
-	case HAL_DEF_DBG_DUMP_TXPKT:
-		*((u8 *)pValue) = haldata->bDumpTxPkt;
-		break;
 	default:
 		break;
 	}
@@ -1433,9 +1430,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 			}
 		}
 		break;
-	case HAL_DEF_DBG_DUMP_TXPKT:
-		haldata->bDumpTxPkt = *((u8 *)pValue);
-		break;
 	default:
 		break;
 	}
drivers/staging/r8188eu/include/hal_intf.h +0 -1
index 8ecb49c4f038..c18f130f8153 100644
@@ -46,7 +46,6 @@ enum hal_def_variable {
 	HAL_DEF_IS_SUPPORT_ANT_DIV,
 	HAL_DEF_CURRENT_ANTENNA,
 	HAL_DEF_DBG_DM_FUNC,/* for dbg */
-	HAL_DEF_DBG_DUMP_TXPKT,
 };
 
 typedef s32 (*c2h_id_filter)(u8 id);
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -2
index 5bda353b6a41..d2a069d4e1cc 100644
@@ -160,8 +160,6 @@ struct hal_data_8188e {
 	u8	AntDivCfg;
 	u8	TRxAntDivType;
 
-	u8	bDumpTxPkt;/* for debug */
-
 	u8	OutEpQueueSel;
 	u8	OutEpNumber;
 
drivers/staging/r8188eu/os_dep/ioctl_linux.c +0 -4
index a45d60a7c19b..7df213856d66 100644
@@ -3632,10 +3632,6 @@ static int rtw_dbg_port(struct net_device *dev,
 			break;
 		case 0x09:
 			break;
-		case 0x0c:/* dump rx/tx packet */
-			if (arg == 1)
-				SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DUMP_TXPKT, &extra_arg);
-			break;
 		case 0x15:
 			break;
 		case 0x10:/*  driver version display */
Signature · 1 line
2.30.2