summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authornavin patidar <navin.patidar@gmail.com>2014-06-16 16:05:40 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 22:37:17 (GMT)
commitdc69f11cf1daecd6b602b6c49001207bef459ce4 (patch)
tree173023e10f88995668897aa3d2ef287139f592a0 /drivers/staging
parent2ace82d69246bbc07389109cfd89e539383707ea (diff)
downloadlinux-dc69f11cf1daecd6b602b6c49001207bef459ce4.tar.xz
staging: rtl8188eu: Remove function nat25_db_cleanup()
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8188eu/core/rtw_br_ext.c26
-rw-r--r--drivers/staging/rtl8188eu/core/rtw_cmd.c3
-rw-r--r--drivers/staging/rtl8188eu/include/rtw_br_ext.h2
-rw-r--r--drivers/staging/rtl8188eu/os_dep/os_intfs.c2
4 files changed, 1 insertions, 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 */