2021-10-02 14:25:13

by Saurav Girepunje

Subject: [PATCH] staging: r8188eu: core: remove unused variable local variable

Remove unused local variable macAddr.

Signed-off-by: Saurav Girepunje <[email protected]>
---
drivers/staging/r8188eu/core/rtw_br_ext.c | 3 +--
drivers/staging/r8188eu/core/rtw_xmit.c | 2 +-
drivers/staging/r8188eu/include/usb_osintf.h | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
index 62a672243696..bcd0f9dd64b1 100644
--- a/drivers/staging/r8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
@@ -695,8 +695,7 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
}
}

-void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
- unsigned char *ipAddr)
+void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr)
{
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];
struct nat25_network_db_entry *db;
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index f9ae48f73cdf..b34cb5b97df1 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -1593,7 +1593,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
if (*((__be16 *)(skb->data + MACADDRLEN * 2)) == __constant_htons(ETH_P_IP)) {
if (memcmp(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN)) {
padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter,
- skb->data + MACADDRLEN, skb->data + WLAN_ETHHDR_LEN + 12);
+ skb->data + WLAN_ETHHDR_LEN + 12);
if (padapter->scdb_entry) {
memcpy(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN);
memcpy(padapter->scdb_ip, skb->data + WLAN_ETHHDR_LEN + 12, 4);
diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
index 34229b1cb081..624298b4bd0b 100644
--- a/drivers/staging/r8188eu/include/usb_osintf.h
+++ b/drivers/staging/r8188eu/include/usb_osintf.h
@@ -19,8 +19,7 @@ u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
void netdev_br_init(struct net_device *netdev);
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
-void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
- unsigned char *ipAddr);
+void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr);
void nat25_db_expire(struct adapter *priv);
int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method);

--
2.32.0

2021-10-03 11:02:25

by Michael Straube

Subject: Re: [PATCH] staging: r8188eu: core: remove unused variable local variable

On 10/2/21 16:13, Saurav Girepunje wrote:
> Remove unused local variable macAddr.
>
> Signed-off-by: Saurav Girepunje <[email protected]>
> ---
> drivers/staging/r8188eu/core/rtw_br_ext.c | 3 +--
> drivers/staging/r8188eu/core/rtw_xmit.c | 2 +-
> drivers/staging/r8188eu/include/usb_osintf.h | 3 +--
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
> index 62a672243696..bcd0f9dd64b1 100644
> --- a/drivers/staging/r8188eu/core/rtw_br_ext.c
> +++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
> @@ -695,8 +695,7 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
> }
> }
>
> -void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
> - unsigned char *ipAddr)
> +void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr)
> {
> unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];
> struct nat25_network_db_entry *db;
> diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
> index f9ae48f73cdf..b34cb5b97df1 100644
> --- a/drivers/staging/r8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
> @@ -1593,7 +1593,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
> if (*((__be16 *)(skb->data + MACADDRLEN * 2)) == __constant_htons(ETH_P_IP)) {
> if (memcmp(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN)) {
> padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter,
> - skb->data + MACADDRLEN, skb->data + WLAN_ETHHDR_LEN + 12);
> + skb->data + WLAN_ETHHDR_LEN + 12);
> if (padapter->scdb_entry) {
> memcpy(padapter->scdb_mac, skb->data + MACADDRLEN, MACADDRLEN);
> memcpy(padapter->scdb_ip, skb->data + WLAN_ETHHDR_LEN + 12, 4);
> diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h
> index 34229b1cb081..624298b4bd0b 100644
> --- a/drivers/staging/r8188eu/include/usb_osintf.h
> +++ b/drivers/staging/r8188eu/include/usb_osintf.h
> @@ -19,8 +19,7 @@ u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest,
> int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
> void netdev_br_init(struct net_device *netdev);
> void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
> -void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
> - unsigned char *ipAddr);
> +void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr);
> void nat25_db_expire(struct adapter *priv);
> int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method);
>
> --
> 2.32.0
>

Looks good to me.

Acked-by: Michael Straube <[email protected]>

Thanks,
Michael