2014-07-28 17:45:11

by navin patidar

[permalink] [raw]
Subject: [PATCH 1/9] staging: rtl8188eu: Remove unused member MultiFunc from struct hal_data_8188e


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 -
drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 161138f..fbf70f6 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -517,7 +517,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter)
pHalData->RegulatorMode = ((value32 & TRP_BT_EN) ? RT_LDO_REGULATOR : RT_SWITCHING_REGULATOR);

ChipVersion.ROMVer = 0; /* ROM code version. */
- pHalData->MultiFunc = RT_MULTI_FUNC_NONE;

dump_chip_info(ChipVersion);

diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index 4b7b069..fb20653 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -240,7 +240,6 @@ enum rt_regulator_mode {

struct hal_data_8188e {
struct HAL_VERSION VersionID;
- enum rt_multi_func MultiFunc; /* For multi-function consideration. */
enum rt_regulator_mode RegulatorMode; /* switching regulator or LDO */
u16 CustomerID;

--
1.7.10.4


2014-07-28 17:42:13

by navin patidar

[permalink] [raw]
Subject: [PATCH 2/9] staging: rtl8188eu: Remove wrapper function rtw_join_timeout_handler()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 3 ++-
drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 +--
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 10 +---------
3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index c15fab2..f63f1c2 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1362,8 +1362,9 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss
* @adapter: pointer to struct adapter structure
*/
-void _rtw_join_timeout_handler (struct adapter *adapter)
+void _rtw_join_timeout_handler (void *function_context)
{
+ struct adapter *adapter = (struct adapter *)function_context;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
int do_join_r;

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 5b1fcd2..40b0c4b 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -436,7 +436,6 @@ void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_indicate_wx_assoc_event(struct adapter *padapter);
void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
int event_thread(void *context);
-void rtw_join_timeout_handler(void *FunctionContext);
void _rtw_scan_timeout_handler(void *FunctionContext);
void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall);
int rtw_init_mlme_priv(struct adapter *adapter);
@@ -553,7 +552,7 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter);

void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);

-void _rtw_join_timeout_handler(struct adapter *adapter);
+void _rtw_join_timeout_handler(void *function_context);
void rtw_scan_timeout_handler(struct adapter *adapter);

void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index 737677c..41d2459 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -25,14 +25,6 @@
#include <drv_types.h>
#include <mlme_osdep.h>

-void rtw_join_timeout_handler (void *FunctionContext)
-{
- struct adapter *adapter = (struct adapter *)FunctionContext;
-
- _rtw_join_timeout_handler(adapter);
-}
-
-
void _rtw_scan_timeout_handler (void *FunctionContext)
{
struct adapter *adapter = (struct adapter *)FunctionContext;
@@ -54,7 +46,7 @@ void rtw_init_mlme_timer(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

- _init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, rtw_join_timeout_handler, padapter);
+ _init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, _rtw_join_timeout_handler, padapter);
_init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter);
_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
}
--
1.7.10.4

2014-07-28 17:42:20

by navin patidar

[permalink] [raw]
Subject: [PATCH 3/9] staging: rtl8188eu: Remove wrapper function _rtw_scan_timeout_handler()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 3 ++-
drivers/staging/rtl8188eu/include/rtw_mlme.h | 3 +--
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 +--------
3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index f63f1c2..d5b2f51 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1404,8 +1404,9 @@ void _rtw_join_timeout_handler (void *function_context)
* rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey
* @adapter: pointer to struct adapter structure
*/
-void rtw_scan_timeout_handler (struct adapter *adapter)
+void rtw_scan_timeout_handler (void *function_context)
{
+ struct adapter *adapter = (struct adapter *)function_context;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;

DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 40b0c4b..8f5457b 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -436,7 +436,6 @@ void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_indicate_wx_assoc_event(struct adapter *padapter);
void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
int event_thread(void *context);
-void _rtw_scan_timeout_handler(void *FunctionContext);
void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall);
int rtw_init_mlme_priv(struct adapter *adapter);
void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);
@@ -553,7 +552,7 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter);
void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);

void _rtw_join_timeout_handler(void *function_context);
-void rtw_scan_timeout_handler(struct adapter *adapter);
+void rtw_scan_timeout_handler(void *function_context);

void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
#define rtw_is_scan_deny(adapter) false
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index 41d2459..0bfaa78 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -25,13 +25,6 @@
#include <drv_types.h>
#include <mlme_osdep.h>

-void _rtw_scan_timeout_handler (void *FunctionContext)
-{
- struct adapter *adapter = (struct adapter *)FunctionContext;
-
- rtw_scan_timeout_handler(adapter);
-}
-
static void _dynamic_check_timer_handlder(void *FunctionContext)
{
struct adapter *adapter = (struct adapter *)FunctionContext;
@@ -47,7 +40,7 @@ void rtw_init_mlme_timer(struct adapter *padapter)
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

_init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, _rtw_join_timeout_handler, padapter);
- _init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, _rtw_scan_timeout_handler, padapter);
+ _init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, rtw_scan_timeout_handler, padapter);
_init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
}

--
1.7.10.4

2014-07-28 17:42:30

by navin patidar

[permalink] [raw]
Subject: [PATCH 4/9] staging: rtl8188eu: Remove wrapper function _dynamic_check_timer_handlder()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 ++++++++-----
drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 12 +-----------
3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index d5b2f51..149c271 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1431,24 +1431,27 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
}
}

-void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
+void rtw_dynamic_check_timer_handlder(void *function_context)
{
+ struct adapter *adapter = (struct adapter *)function_context;
struct registry_priv *pregistrypriv = &adapter->registrypriv;

if (!adapter)
- return;
+ goto exit;
if (!adapter->hw_init_completed)
- return;
+ goto exit;
if ((adapter->bDriverStopped) || (adapter->bSurpriseRemoved))
- return;
+ goto exit;
if (adapter->net_closed)
- return;
+ goto exit;
rtw_dynamic_chk_wk_cmd(adapter);

if (pregistrypriv->wifi_spec == 1) {
/* auto site survey */
rtw_auto_scan_handler(adapter);
}
+exit:
+ _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
}

#define RTW_SCAN_RESULT_EXPIRE 2000
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 8f5457b..8d83f7c 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -554,7 +554,7 @@ void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);
void _rtw_join_timeout_handler(void *function_context);
void rtw_scan_timeout_handler(void *function_context);

-void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
+void rtw_dynamic_check_timer_handlder(void *function_context);
#define rtw_is_scan_deny(adapter) false
#define rtw_clear_scan_deny(adapter) do {} while (0)
#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index 0bfaa78..82b71fa 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -25,23 +25,13 @@
#include <drv_types.h>
#include <mlme_osdep.h>

-static void _dynamic_check_timer_handlder(void *FunctionContext)
-{
- struct adapter *adapter = (struct adapter *)FunctionContext;
-
- if (adapter->registrypriv.mp_mode == 1)
- return;
- rtw_dynamic_check_timer_handlder(adapter);
- _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
-}
-
void rtw_init_mlme_timer(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

_init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, _rtw_join_timeout_handler, padapter);
_init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, rtw_scan_timeout_handler, padapter);
- _init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
+ _init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, rtw_dynamic_check_timer_handlder, padapter);
}

void rtw_os_indicate_connect(struct adapter *adapter)
--
1.7.10.4

2014-07-28 17:42:38

by navin patidar

[permalink] [raw]
Subject: [PATCH 5/9] staging: rtl8188eu: Remove wrapper function _survey_timer_hdl()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3 ++-
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 9 +--------
3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 41cfd30..b113f0b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4833,8 +4833,9 @@ void linked_status_chk(struct adapter *padapter)
}
}

-void survey_timer_hdl(struct adapter *padapter)
+void survey_timer_hdl(void *function_context)
{
+ struct adapter *padapter = (struct adapter *)function_context;
struct cmd_obj *ph2c;
struct sitesurvey_parm *psurveyPara;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index 654bd36..a948d45 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -646,7 +646,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter,

void linked_status_chk(struct adapter *padapter);

-void survey_timer_hdl (struct adapter *padapter);
+void survey_timer_hdl (void *function_context);
void link_timer_hdl (struct adapter *padapter);
void addba_timer_hdl(struct sta_info *psta);

diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index 82b71fa..f59e130 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -129,13 +129,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
}
}

-static void _survey_timer_hdl(void *FunctionContext)
-{
- struct adapter *padapter = (struct adapter *)FunctionContext;
-
- survey_timer_hdl(padapter);
-}
-
static void _link_timer_hdl(void *FunctionContext)
{
struct adapter *padapter = (struct adapter *)FunctionContext;
@@ -157,7 +150,7 @@ void init_mlme_ext_timer(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

- _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, _survey_timer_hdl, padapter);
+ _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, survey_timer_hdl, padapter);
_init_timer(&pmlmeext->link_timer, padapter->pnetdev, _link_timer_hdl, padapter);
}

--
1.7.10.4

2014-07-28 17:42:43

by navin patidar

[permalink] [raw]
Subject: [PATCH 6/9] staging: rtl8188eu: Remove wrapper function _link_timer_hdl()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3 ++-
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +-------
3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index b113f0b..f18bb78 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4873,8 +4873,9 @@ exit_survey_timer_hdl:
return;
}

-void link_timer_hdl(struct adapter *padapter)
+void link_timer_hdl(void *function_context)
{
+ struct adapter *padapter = (struct adapter *)function_context;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index a948d45..05a010f 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -647,7 +647,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter,
void linked_status_chk(struct adapter *padapter);

void survey_timer_hdl (void *function_context);
-void link_timer_hdl (struct adapter *padapter);
+void link_timer_hdl (void *funtion_context);
void addba_timer_hdl(struct sta_info *psta);

#define set_survey_timer(mlmeext, ms) \
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index f59e130..4f5fa08 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -129,12 +129,6 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
}
}

-static void _link_timer_hdl(void *FunctionContext)
-{
- struct adapter *padapter = (struct adapter *)FunctionContext;
- link_timer_hdl(padapter);
-}
-
static void _addba_timer_hdl(void *FunctionContext)
{
struct sta_info *psta = (struct sta_info *)FunctionContext;
@@ -151,7 +145,7 @@ void init_mlme_ext_timer(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

_init_timer(&pmlmeext->survey_timer, padapter->pnetdev, survey_timer_hdl, padapter);
- _init_timer(&pmlmeext->link_timer, padapter->pnetdev, _link_timer_hdl, padapter);
+ _init_timer(&pmlmeext->link_timer, padapter->pnetdev, link_timer_hdl, padapter);
}

#ifdef CONFIG_88EU_AP_MODE
--
1.7.10.4

2014-07-28 17:42:51

by navin patidar

[permalink] [raw]
Subject: [PATCH 7/9] staging: rtl8188eu: Remove wrapper function _addba_timer_hdl()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 3 ++-
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 8 +-------
3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index f18bb78..5ba5099 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4910,8 +4910,9 @@ void link_timer_hdl(void *function_context)
return;
}

-void addba_timer_hdl(struct sta_info *psta)
+void addba_timer_hdl(void *function_context)
{
+ struct sta_info *psta = (struct sta_info *)function_context;
struct ht_priv *phtpriv;

if (!psta)
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index 05a010f..d699ca1 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -648,7 +648,7 @@ void linked_status_chk(struct adapter *padapter);

void survey_timer_hdl (void *function_context);
void link_timer_hdl (void *funtion_context);
-void addba_timer_hdl(struct sta_info *psta);
+void addba_timer_hdl(void *function_context);

#define set_survey_timer(mlmeext, ms) \
do { \
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index 4f5fa08..1b892c4 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -129,15 +129,9 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
}
}

-static void _addba_timer_hdl(void *FunctionContext)
-{
- struct sta_info *psta = (struct sta_info *)FunctionContext;
- addba_timer_hdl(psta);
-}
-
void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta)
{
- _init_timer(&psta->addba_retry_timer, padapter->pnetdev, _addba_timer_hdl, psta);
+ _init_timer(&psta->addba_retry_timer, padapter->pnetdev, addba_timer_hdl, psta);
}

void init_mlme_ext_timer(struct adapter *padapter)
--
1.7.10.4

2014-07-28 17:43:02

by navin patidar

[permalink] [raw]
Subject: [PATCH 8/9] staging: rtl81888eu: Remove unused function rtw_os_read_port()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/include/recv_osdep.h | 2 --
drivers/staging/rtl8188eu/os_dep/recv_linux.c | 12 ------------
2 files changed, 14 deletions(-)

diff --git a/drivers/staging/rtl8188eu/include/recv_osdep.h b/drivers/staging/rtl8188eu/include/recv_osdep.h
index a52a696..5aabd39 100644
--- a/drivers/staging/rtl8188eu/include/recv_osdep.h
+++ b/drivers/staging/rtl8188eu/include/recv_osdep.h
@@ -43,8 +43,6 @@ int rtw_os_recv_resource_alloc(struct adapter *adapt,

int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *buf);

-void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf);
-
void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl);
int _netdev_open(struct net_device *pnetdev);
int netdev_open(struct net_device *pnetdev);
diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index f8ac996..f7d53dd 100644
--- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -191,18 +191,6 @@ _recv_indicatepkt_drop:
return _FAIL;
}

-void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)
-{
- struct recv_priv *precvpriv = &padapter->recvpriv;
-
- /* free skb in recv_buf */
- dev_kfree_skb_any(precvbuf->pskb);
- precvbuf->pskb = NULL;
- precvbuf->reuse = false;
- usb_read_port(padapter, precvpriv->ff_hwaddr, 0,
- (unsigned char *)precvbuf);
-}
-
static void _rtw_reordering_ctrl_timeout_handler(void *func_context)
{
struct recv_reorder_ctrl *preorder_ctrl;
--
1.7.10.4

2014-07-28 17:43:11

by navin patidar

[permalink] [raw]
Subject: [PATCH 9/9] staging:rtl8188eu:Remove wrapper function _rtw_reordering_ctrl_timeout_handler()


Signed-off-by: navin patidar <[email protected]>
---
drivers/staging/rtl8188eu/os_dep/recv_linux.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index f7d53dd..05427c4 100644
--- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -191,17 +191,9 @@ _recv_indicatepkt_drop:
return _FAIL;
}

-static void _rtw_reordering_ctrl_timeout_handler(void *func_context)
-{
- struct recv_reorder_ctrl *preorder_ctrl;
-
- preorder_ctrl = (struct recv_reorder_ctrl *)func_context;
- rtw_reordering_ctrl_timeout_handler(preorder_ctrl);
-}
-
void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
{
struct adapter *padapter = preorder_ctrl->padapter;

- _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl);
+ _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, rtw_reordering_ctrl_timeout_handler, preorder_ctrl);
}
--
1.7.10.4