staging: rtl8188eu: Remove wrapper function _addba_timer_hdl()
authornavin patidar <navin.patidar@gmail.com>
Mon, 28 Jul 2014 17:41:28 +0000 (23:11 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 31 Jul 2014 00:16:10 +0000 (17:16 -0700)
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
drivers/staging/rtl8188eu/os_dep/mlme_linux.c

index f18bb78defcbf56cfa1cb17d50febec945e9c885..5ba5099ec20d1af8fd4415b8dbeab8d3dd1fdcc8 100644 (file)
@@ -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)
index 05a010f5aeb3f20e3302aeef8e0248d818632501..d699ca19ef1627c4cec627022223916ea7a33f23 100644 (file)
@@ -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 { \
index 4f5fa08ecf9cd8586448c786f1efad0b5a878494..1b892c424cb8be54c9cf70c94acca67530462697 100644 (file)
@@ -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)