rtl8723ds: Update source for recent API changes

The source will now compile on kernels up to 4.20.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2018-11-29 11:43:26 -06:00
parent 5949fdf1cc
commit 3030a734d7
19 changed files with 410 additions and 86 deletions

View File

@@ -373,7 +373,6 @@ struct led_priv {
(adapter)->ledpriv.SwLedOff((adapter), (pLed)); \
} while (0)
void BlinkTimerCallback(void *data);
void BlinkWorkItemCallback(_workitem *work);
void ResetLedStatus(PLED_DATA pLed);

View File

@@ -320,8 +320,9 @@ extern void rtw_udelay_os(int us);
extern void rtw_yield_os(void);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0))
extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);
#endif
__inline static unsigned char _cancel_timer_ex(_timer *ptimer)
{

View File

@@ -283,6 +283,7 @@ __inline static void rtw_list_delete(_list *plist)
#define RTW_TIMER_HDL_ARGS void *FunctionContext
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
__inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void *cntx)
{
/* setup_timer(ptimer, pfunc,(u32)cntx); */
@@ -290,6 +291,7 @@ __inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc,
ptimer->data = (unsigned long)cntx;
init_timer(ptimer);
}
#endif
__inline static void _set_timer(_timer *ptimer, u32 delay_time)
{

View File

@@ -903,8 +903,6 @@ void rtw_sta_timeout_event_callback(_adapter *adapter, u8 *pbuf);
void rtw_update_ft_stainfo(_adapter *padapter, WLAN_BSSID_EX *pnetwork);
void rtw_ft_reassoc_event_callback(_adapter *padapter, u8 *pbuf);
#endif
extern void rtw_join_timeout_handler(RTW_TIMER_HDL_ARGS);
extern void _rtw_scan_timeout_handler(RTW_TIMER_HDL_ARGS);
thread_return event_thread(thread_context context);
@@ -1052,10 +1050,22 @@ extern void rtw_update_registrypriv_dev_network(_adapter *adapter);
extern void rtw_get_encrypt_decrypt_from_registrypriv(_adapter *adapter);
extern void _rtw_join_timeout_handler(_adapter *adapter);
extern void rtw_scan_timeout_handler(_adapter *adapter);
void _rtw_join_timeout_handler(_adapter *adapter);
void rtw_scan_timeout_handler(_adapter *adapter);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void rtw_join_timeout_handler(struct timer_list *t);
void _rtw_scan_timeout_handler(struct timer_list *t);
#else
void _rtw_scan_timeout_handler(RTW_TIMER_HDL_ARGS);
void rtw_join_timeout_handler(RTW_TIMER_HDL_ARGS);
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
extern void _dynamic_check_timer_handlder(void *FunctionContext);
#else
void _dynamic_check_timer_handlder(struct timer_list *t);
#endif
extern void rtw_dynamic_check_timer_handlder(_adapter *adapter);
extern void rtw_iface_dynamic_check_timer_handlder(_adapter *adapter);

View File

@@ -306,6 +306,7 @@ typedef struct lps_poff_info {
#endif /*CONFIG_LPS_POFF*/
struct pwrctrl_priv {
_adapter *padapter;
_pwrlock lock;
_pwrlock check_32k_lock;
volatile u8 rpwm; /* requested power state for fw */

View File

@@ -925,7 +925,9 @@ typedef enum _HT_CAP_AMPDU_DENSITY {
* According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)
*/
#define IEEE80211_MIN_AMPDU_BUF 0x8
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
#define IEEE80211_MAX_AMPDU_BUF 0x40
#endif
/* Spatial Multiplexing Power Save Modes */