|
@@ -88,7 +88,7 @@ MODULE_PARM_DESC(rtw_lps_level, "The default LPS level");
|
|
|
|
|
|
|
|
module_param(rtw_lps_chk_by_tp, int, 0644);
|
|
module_param(rtw_lps_chk_by_tp, int, 0644);
|
|
|
|
|
|
|
|
-/* LPS:
|
|
|
|
|
|
|
+/* LPS:
|
|
|
* rtw_smart_ps = 0 => TX: pwr bit = 1, RX: PS_Poll
|
|
* rtw_smart_ps = 0 => TX: pwr bit = 1, RX: PS_Poll
|
|
|
* rtw_smart_ps = 1 => TX: pwr bit = 0, RX: PS_Poll
|
|
* rtw_smart_ps = 1 => TX: pwr bit = 0, RX: PS_Poll
|
|
|
* rtw_smart_ps = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0
|
|
* rtw_smart_ps = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0
|
|
@@ -97,8 +97,8 @@ int rtw_smart_ps = 2;
|
|
|
|
|
|
|
|
int rtw_max_bss_cnt = 0;
|
|
int rtw_max_bss_cnt = 0;
|
|
|
module_param(rtw_max_bss_cnt, int, 0644);
|
|
module_param(rtw_max_bss_cnt, int, 0644);
|
|
|
-#ifdef CONFIG_WMMPS_STA
|
|
|
|
|
-/* WMMPS:
|
|
|
|
|
|
|
+#ifdef CONFIG_WMMPS_STA
|
|
|
|
|
+/* WMMPS:
|
|
|
* rtw_smart_ps = 0 => Only for fw test
|
|
* rtw_smart_ps = 0 => Only for fw test
|
|
|
* rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap
|
|
* rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap
|
|
|
* rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap
|
|
* rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap
|
|
@@ -1322,11 +1322,23 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
|
|
|
|
|
+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
|
|
|
|
|
+ , struct net_device *sb_dev
|
|
|
|
|
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0))
|
|
|
|
|
+ , select_queue_fallback_t fallback
|
|
|
|
|
+ #endif
|
|
|
|
|
+)
|
|
|
|
|
+#else
|
|
|
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
|
|
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
|
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
|
|
|
- , struct net_device *sb_dev
|
|
|
|
|
|
|
+ , void *accel_priv
|
|
|
|
|
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
|
|
|
|
|
+ , select_queue_fallback_t fallback
|
|
|
|
|
+ #endif
|
|
|
#endif
|
|
#endif
|
|
|
)
|
|
)
|
|
|
|
|
+#endif
|
|
|
{
|
|
{
|
|
|
_adapter *padapter = rtw_netdev_priv(dev);
|
|
_adapter *padapter = rtw_netdev_priv(dev);
|
|
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
|
@@ -3268,7 +3280,7 @@ int _netdev_open(struct net_device *pnetdev)
|
|
|
}
|
|
}
|
|
|
#endif /*CONFIG_AUTOSUSPEND*/
|
|
#endif /*CONFIG_AUTOSUSPEND*/
|
|
|
|
|
|
|
|
- if (!rtw_is_hw_init_completed(padapter)) { // ips
|
|
|
|
|
|
|
+ if (!rtw_is_hw_init_completed(padapter)) { // ips
|
|
|
rtw_clr_surprise_removed(padapter);
|
|
rtw_clr_surprise_removed(padapter);
|
|
|
rtw_clr_drv_stopped(padapter);
|
|
rtw_clr_drv_stopped(padapter);
|
|
|
RTW_ENABLE_FUNC(padapter, DF_RX_BIT);
|
|
RTW_ENABLE_FUNC(padapter, DF_RX_BIT);
|
|
@@ -3290,7 +3302,7 @@ int _netdev_open(struct net_device *pnetdev)
|
|
|
{
|
|
{
|
|
|
#ifdef CONFIG_BT_COEXIST_SOCKET_TRX
|
|
#ifdef CONFIG_BT_COEXIST_SOCKET_TRX
|
|
|
_adapter *prim_adpt = GET_PRIMARY_ADAPTER(padapter);
|
|
_adapter *prim_adpt = GET_PRIMARY_ADAPTER(padapter);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (prim_adpt && (_TRUE == prim_adpt->EEPROMBluetoothCoexist)) {
|
|
if (prim_adpt && (_TRUE == prim_adpt->EEPROMBluetoothCoexist)) {
|
|
|
rtw_btcoex_init_socket(prim_adpt);
|
|
rtw_btcoex_init_socket(prim_adpt);
|
|
|
prim_adpt->coex_info.BtMgnt.ExtConfig.HCIExtensionVer = 0x04;
|
|
prim_adpt->coex_info.BtMgnt.ExtConfig.HCIExtensionVer = 0x04;
|
|
@@ -3677,7 +3689,7 @@ int _pm_netdev_open(_adapter *padapter)
|
|
|
}
|
|
}
|
|
|
#endif /*CONFIG_AUTOSUSPEND*/
|
|
#endif /*CONFIG_AUTOSUSPEND*/
|
|
|
|
|
|
|
|
- if (!rtw_is_hw_init_completed(padapter)) { // ips
|
|
|
|
|
|
|
+ if (!rtw_is_hw_init_completed(padapter)) { // ips
|
|
|
rtw_clr_surprise_removed(padapter);
|
|
rtw_clr_surprise_removed(padapter);
|
|
|
rtw_clr_drv_stopped(padapter);
|
|
rtw_clr_drv_stopped(padapter);
|
|
|
status = rtw_hal_init(padapter);
|
|
status = rtw_hal_init(padapter);
|