From 2885e9c222793125c3d1328d37b82bf3358969ff Mon Sep 17 00:00:00 2001 From: morrownr Date: Thu, 9 Feb 2023 23:32:14 -0600 Subject: [PATCH] minor updates --- core/rtw_br_ext.c | 2 +- core/rtw_mlme_ext.c | 5 +++++ os_dep/linux/ioctl_cfg80211.c | 8 ++++---- os_dep/linux/os_intfs.c | 14 +++++++------- os_dep/linux/recv_linux.c | 1 + 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index a5145e6..8474461 100644 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -207,7 +207,7 @@ static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networ #endif -static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, +static void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, unsigned char *ac_mac, unsigned short *sid) { memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index ce9eb22..e0848dd 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -12246,6 +12246,11 @@ static void rtw_mlmeext_disconnect(_adapter *padapter) self_action = MLME_STA_DISCONNECTED; else if (MLME_IS_ADHOC(padapter) || MLME_IS_ADHOC_MASTER(padapter)) self_action = MLME_ADHOC_STOPPED; +/* nrm */ +#ifdef CONFIG_WIFI_MONITOR + else if (MLME_IS_MONITOR(padapter)) + self_action = MLME_ACTION_NONE; +#endif else { RTW_INFO("state:0x%x\n", MLME_STATE(padapter)); rtw_warn_on(1); diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 38f1aa1..f1f67ba 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -29,10 +29,10 @@ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) #define STATION_INFO_INACTIVE_TIME BIT(NL80211_STA_INFO_INACTIVE_TIME) -#define STATION_INFO_LLID BIT(NL80211_STA_INFO_LLID) -#define STATION_INFO_PLID BIT(NL80211_STA_INFO_PLID) +#define STATION_INFO_LLID BIT(NL80211_STA_INFO_LLID) +#define STATION_INFO_PLID BIT(NL80211_STA_INFO_PLID) #define STATION_INFO_PLINK_STATE BIT(NL80211_STA_INFO_PLINK_STATE) -#define STATION_INFO_SIGNAL BIT(NL80211_STA_INFO_SIGNAL) +#define STATION_INFO_SIGNAL BIT(NL80211_STA_INFO_SIGNAL) #define STATION_INFO_TX_BITRATE BIT(NL80211_STA_INFO_TX_BITRATE) #define STATION_INFO_RX_PACKETS BIT(NL80211_STA_INFO_RX_PACKETS) #define STATION_INFO_TX_PACKETS BIT(NL80211_STA_INFO_TX_PACKETS) @@ -229,7 +229,7 @@ static u8 rtw_chbw_to_cfg80211_chan_def(struct wiphy *wiphy, struct cfg80211_cha if (!chan) goto exit; - if (bw == CHANNEL_WIDTH_20) + if (bw == CHANNEL_WIDTH_20) chdef->width = ht ? NL80211_CHAN_WIDTH_20 : NL80211_CHAN_WIDTH_20_NOHT; else if (bw == CHANNEL_WIDTH_40) chdef->width = NL80211_CHAN_WIDTH_40; diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 7b25f29..6e9479e 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -72,7 +72,7 @@ int rtw_scan_mode = 1;/* active, passive */ #else int rtw_wow_power_mgnt = PS_MODE_ACTIVE; int rtw_wow_lps_level = LPS_NORMAL; -#endif +#endif #endif /* CONFIG_WOWLAN */ #else /* !CONFIG_POWER_SAVING */ @@ -118,7 +118,7 @@ MODULE_PARM_DESC(rtw_wow_lps_1t1r, "The default WOW LPS 1T1R setting"); #endif #endif /* CONFIG_WOWLAN */ -/* LPS: +/* LPS: * 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 = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0 @@ -127,8 +127,8 @@ int rtw_smart_ps = 2; int rtw_max_bss_cnt = 0; 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 = 1 => Refer to Beacon's TIM Bitmap * rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap @@ -200,7 +200,7 @@ int rtw_uapsd_ac_enable = 0x0; /*PHYDM API, must enable by default*/ int rtw_pwrtrim_enable = 1; #else - int rtw_pwrtrim_enable = 0; /* Default Enalbe power trim by efuse config */ + int rtw_pwrtrim_enable = 0; /* Default Enable power trim by efuse config */ #endif #if CONFIG_TX_AC_LIFETIME @@ -3937,7 +3937,7 @@ int _netdev_open(struct net_device *pnetdev) #ifdef CONFIG_IOCTL_CFG80211 rtw_cfg80211_init_wdev_data(padapter); #endif - /* rtw_netif_carrier_on(pnetdev); */ /* call this func when rtw_joinbss_event_callback return success */ + rtw_netif_carrier_on(pnetdev); /* call this func when rtw_joinbss_event_callback return success */ rtw_netif_wake_queue(pnetdev); #ifdef CONFIG_BR_EXT @@ -4058,7 +4058,7 @@ int _netdev_open(struct net_device *pnetdev) rtw_set_pwr_state_check_timer(pwrctrlpriv); #endif - /* rtw_netif_carrier_on(pnetdev); */ /* call this func when rtw_joinbss_event_callback return success */ + rtw_netif_carrier_on(pnetdev); /* call this func when rtw_joinbss_event_callback return success */ rtw_netif_wake_queue(pnetdev); #ifdef CONFIG_BR_EXT diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c index 14fc295..deae367 100644 --- a/os_dep/linux/recv_linux.c +++ b/os_dep/linux/recv_linux.c @@ -139,6 +139,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8 precvframe->u.hdr.pkt = rtw_skb_clone(pskb); if (precvframe->u.hdr.pkt) { + RTW_INFO("%s: rtw_skb_clone success, RX throughput may be low!\n", __FUNCTION__); precvframe->u.hdr.pkt->dev = padapter->pnetdev; precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pdata; precvframe->u.hdr.rx_end = pdata + alloc_sz;