minor updates
This commit is contained in:
parent
7aace6648a
commit
2885e9c222
@ -207,7 +207,7 @@ static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networ
|
|||||||
#endif
|
#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)
|
unsigned char *ac_mac, unsigned short *sid)
|
||||||
{
|
{
|
||||||
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
|
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
|
||||||
|
@ -12246,6 +12246,11 @@ static void rtw_mlmeext_disconnect(_adapter *padapter)
|
|||||||
self_action = MLME_STA_DISCONNECTED;
|
self_action = MLME_STA_DISCONNECTED;
|
||||||
else if (MLME_IS_ADHOC(padapter) || MLME_IS_ADHOC_MASTER(padapter))
|
else if (MLME_IS_ADHOC(padapter) || MLME_IS_ADHOC_MASTER(padapter))
|
||||||
self_action = MLME_ADHOC_STOPPED;
|
self_action = MLME_ADHOC_STOPPED;
|
||||||
|
/* nrm */
|
||||||
|
#ifdef CONFIG_WIFI_MONITOR
|
||||||
|
else if (MLME_IS_MONITOR(padapter))
|
||||||
|
self_action = MLME_ACTION_NONE;
|
||||||
|
#endif
|
||||||
else {
|
else {
|
||||||
RTW_INFO("state:0x%x\n", MLME_STATE(padapter));
|
RTW_INFO("state:0x%x\n", MLME_STATE(padapter));
|
||||||
rtw_warn_on(1);
|
rtw_warn_on(1);
|
||||||
|
@ -200,7 +200,7 @@ int rtw_uapsd_ac_enable = 0x0;
|
|||||||
/*PHYDM API, must enable by default*/
|
/*PHYDM API, must enable by default*/
|
||||||
int rtw_pwrtrim_enable = 1;
|
int rtw_pwrtrim_enable = 1;
|
||||||
#else
|
#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
|
#endif
|
||||||
|
|
||||||
#if CONFIG_TX_AC_LIFETIME
|
#if CONFIG_TX_AC_LIFETIME
|
||||||
@ -3937,7 +3937,7 @@ int _netdev_open(struct net_device *pnetdev)
|
|||||||
#ifdef CONFIG_IOCTL_CFG80211
|
#ifdef CONFIG_IOCTL_CFG80211
|
||||||
rtw_cfg80211_init_wdev_data(padapter);
|
rtw_cfg80211_init_wdev_data(padapter);
|
||||||
#endif
|
#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);
|
rtw_netif_wake_queue(pnetdev);
|
||||||
|
|
||||||
#ifdef CONFIG_BR_EXT
|
#ifdef CONFIG_BR_EXT
|
||||||
@ -4058,7 +4058,7 @@ int _netdev_open(struct net_device *pnetdev)
|
|||||||
rtw_set_pwr_state_check_timer(pwrctrlpriv);
|
rtw_set_pwr_state_check_timer(pwrctrlpriv);
|
||||||
#endif
|
#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);
|
rtw_netif_wake_queue(pnetdev);
|
||||||
|
|
||||||
#ifdef CONFIG_BR_EXT
|
#ifdef CONFIG_BR_EXT
|
||||||
|
@ -139,6 +139,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8
|
|||||||
|
|
||||||
precvframe->u.hdr.pkt = rtw_skb_clone(pskb);
|
precvframe->u.hdr.pkt = rtw_skb_clone(pskb);
|
||||||
if (precvframe->u.hdr.pkt) {
|
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.pkt->dev = padapter->pnetdev;
|
||||||
precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pdata;
|
precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pdata;
|
||||||
precvframe->u.hdr.rx_end = pdata + alloc_sz;
|
precvframe->u.hdr.rx_end = pdata + alloc_sz;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user