From: navin patidar <navin.patidar@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org,
navin patidar <navin.patidar@gmail.com>
Subject: [PATCH 3/9] staging: rtl8188eu: Remove function nat25_db_cleanup()
Date: Mon, 16 Jun 2014 21:35:40 +0530 [thread overview]
Message-ID: <1402934746-29422-4-git-send-email-navin.patidar@gmail.com> (raw)
In-Reply-To: <1402934746-29422-1-git-send-email-navin.patidar@gmail.com>
We've removed the code which was responsible for building NAT table,
so no use of keeping nat_db_cleanup().
Signed-off-by: navin patidar <navin.patidar@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_br_ext.c | 26 ------------------------
drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 +--
drivers/staging/rtl8188eu/include/rtw_br_ext.h | 2 --
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 --
4 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_br_ext.c b/drivers/staging/rtl8188eu/core/rtw_br_ext.c
index 8689912..b0b1af9 100644
--- a/drivers/staging/rtl8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_br_ext.c
@@ -247,32 +247,6 @@ static inline void __network_hash_unlink(struct nat25_network_db_entry *ent)
* NAT2.5 interface
*/
-void nat25_db_cleanup(struct adapter *priv)
-{
- int i;
-
- spin_lock_bh(&priv->br_ext_lock);
-
- for (i = 0; i < NAT25_HASH_SIZE; i++) {
- struct nat25_network_db_entry *f;
- f = priv->nethash[i];
- while (f != NULL) {
- struct nat25_network_db_entry *g;
-
- g = f->next_hash;
- if (priv->scdb_entry == f) {
- memset(priv->scdb_mac, 0, ETH_ALEN);
- memset(priv->scdb_ip, 0, 4);
- priv->scdb_entry = NULL;
- }
- __network_hash_unlink(f);
- kfree(f);
- f = g;
- }
- }
- spin_unlock_bh(&priv->br_ext_lock);
-}
-
void nat25_db_expire(struct adapter *priv)
{
int i;
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 25f1c36..bb4c703 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -2059,8 +2059,7 @@ void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n ***Error: disconnect_cmd_callback Fail ***\n."));
return;
- } else /* clear bridge database */
- nat25_db_cleanup(padapter);
+ }
/* free cmd */
rtw_free_cmd_obj(pcmd);
diff --git a/drivers/staging/rtl8188eu/include/rtw_br_ext.h b/drivers/staging/rtl8188eu/include/rtw_br_ext.h
index f21e7a4..f0b2a20 100644
--- a/drivers/staging/rtl8188eu/include/rtw_br_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_br_ext.h
@@ -61,6 +61,4 @@ struct br_ext_info {
unsigned int nat25sc_disable;
};
-void nat25_db_cleanup(struct adapter *priv);
-
#endif /* _RTW_BR_EXT_H_ */
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 34f7370..43eaba0 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -1228,8 +1228,6 @@ int netdev_close(struct net_device *pnetdev)
rtw_led_control(padapter, LED_CTL_POWER_OFF);
}
- nat25_db_cleanup(padapter);
-
#ifdef CONFIG_88EU_P2P
rtw_p2p_enable(padapter, P2P_ROLE_DISABLE);
#endif /* CONFIG_88EU_P2P */
--
1.7.10.4
next prev parent reply other threads:[~2014-06-16 16:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 16:05 [PATCH 0/9] staging: rtl8188eu: Remove code implementing NAT navin patidar
2014-06-16 16:05 ` [PATCH 1/9] staging: rtl8188eu: Remove function rtw_br_client_tx() navin patidar
2014-06-16 16:05 ` [PATCH 2/9] staging: rtl8188eu: Remove unused functons defined in rtw_br_ext.c navin patidar
2014-06-16 16:05 ` navin patidar [this message]
2014-06-16 16:05 ` [PATCH 4/9] staging: rtl8188eu: Remove pppoe_connection_in_progress from struct adapter navin patidar
2014-06-16 16:05 ` [PATCH 5/9] staging: rtl8188eu: Remove function nat25_db_expire() navin patidar
2014-06-16 16:05 ` [PATCH 6/9] staging: rtl8188eu: Remove function netdev_br_init() navin patidar
2014-06-16 16:05 ` [PATCH 7/9] staging: rtl8188eu: core: Remove file rtw_br_ext.c navin patidar
2014-06-16 16:05 ` [PATCH 8/9] staging: rtl8188eu: Remove unused members of struct adapter navin patidar
2014-06-16 16:05 ` [PATCH 9/9] staging: rtl8188eu: Remove file rtw_br_ext.h navin patidar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402934746-29422-4-git-send-email-navin.patidar@gmail.com \
--to=navin.patidar@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®