sim1222/rtl8188eus
1
0
Fork 0
mirror of https://github.com/drygdryg/rtl8188eus.git synced 2025-04-29 02:37:16 +09:00
Code Issues Projects Releases Wiki Activity

Some fixes and tweak to similarly to rtl8723bs

Browse Source
This commit is contained in:
kimocoder 2019-02-14 17:52:01 +01:00
parent cb3d26279d
commit cea7924b19
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os_dep/linux/ioctl_cfg80211.c
View File

@ -981,8 +981,10 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
return ; return ;
} }
} else { } else {
if (scanned == NULL) if (scanned == NULL) {
rtw_warn_on(1); rtw_warn_on(1);
return;
}
if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == _TRUE if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == _TRUE
&& _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == _TRUE && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == _TRUE
@ -1240,7 +1242,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
if (is_broadcast_mac_addr(param->sta_addr)) { if (is_broadcast_mac_addr(param->sta_addr)) {
if (param->u.crypt.idx >= WEP_KEYS if (param->u.crypt.idx >= WEP_KEYS
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
&& param->u.crypt.idx > BIP_MAX_KEYID || param->u.crypt.idx > BIP_MAX_KEYID
#endif #endif
) { ) {
ret = -EINVAL; ret = -EINVAL;
@ -1487,7 +1489,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
if (is_broadcast_mac_addr(param->sta_addr)) { if (is_broadcast_mac_addr(param->sta_addr)) {
if (param->u.crypt.idx >= WEP_KEYS if (param->u.crypt.idx >= WEP_KEYS
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
&& param->u.crypt.idx > BIP_MAX_KEYID || param->u.crypt.idx > BIP_MAX_KEYID
#endif #endif
) { ) {
ret = -EINVAL; ret = -EINVAL;
@ -4258,8 +4260,10 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (skb) if (!skb)
rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize); goto fail;
rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, skb->truesize);
if (IS_CH_WAITING(rfctl)) { if (IS_CH_WAITING(rfctl)) {
#ifdef CONFIG_DFS_MASTER #ifdef CONFIG_DFS_MASTER

2
os_dep/linux/os_intfs.c
View File

@ -3598,7 +3598,9 @@ void rtw_ndev_destructor(struct net_device *ndev)
if (ndev->ieee80211_ptr) if (ndev->ieee80211_ptr)
rtw_mfree((u8 *)ndev->ieee80211_ptr, sizeof(struct wireless_dev)); rtw_mfree((u8 *)ndev->ieee80211_ptr, sizeof(struct wireless_dev));
#endif #endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 8))
free_netdev(ndev); free_netdev(ndev);
#endif
} }
#ifdef CONFIG_ARP_KEEP_ALIVE #ifdef CONFIG_ARP_KEEP_ALIVE