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

Merge pull request #4 from kimocoder/v5.3.9

Browse Source 
Merge changes
This commit is contained in:
Christian Bremvåg 2019-05-24 18:46:15 +02:00 committed by GitHub
commit e10ad0223b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -65,9 +65,7 @@ unmanaged-devices=mac:A7:A7:A7:A7:A7
* There is a bug in monitor mode related to Network-Manager. * There is a bug in monitor mode related to Network-Manager.
This needs priority because it causes interferrence. This needs priority because it causes interferrence.
* pcap_activate error on "reaver" - investigate
* Add/upload the documentation
* Add more VID/PIDS for all 3 chipsets supported. * Add more VID/PIDS for all 3 chipsets supported.
* Remove unused functions * Remove unused functions
<br> <br>

5
core/rtw_mlme_ext.c
View File

@ -8999,12 +8999,11 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status
/* setting auth algo number */ /* setting auth algo number */
val16 = (u16)psta->authalg; val16 = (u16)psta->authalg;
if (status != _STATS_SUCCESSFUL_)
val16 = 0;
if (val16) { if (val16) {
val16 = cpu_to_le16(val16); val16 = cpu_to_le16(val16);
use_shared_key = 1; use_shared_key = 1;
} else {
val16 = 0;
} }
pframe = rtw_set_fixed_ie(pframe, _AUTH_ALGM_NUM_, (unsigned char *)&val16, &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, _AUTH_ALGM_NUM_, (unsigned char *)&val16, &(pattrib->pktlen));

4
core/rtw_sta_mgt.c
View File

@ -775,8 +775,8 @@ u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
pstapriv->sta_aid[psta->cmn.aid - 1] = NULL; pstapriv->sta_aid[psta->cmn.aid - 1] = NULL;
psta->cmn.aid = 0; psta->cmn.aid = 0;
} }
if (psta->aid > 31) { if (psta->cmn.aid > 31) {
pr_err("***** psta->aid (%d) out of bounds\n", psta->aid); pr_err("***** psta->aid (%d) out of bounds\n", psta->cmn.aid);
return _FAIL; return _FAIL;
} }
} }

2
dkms.conf
View File

@ -1,5 +1,5 @@
PACKAGE_NAME="realtek-rtl8188eus" PACKAGE_NAME="realtek-rtl8188eus"
PACKAGE_VERSION="5.3.9~20190215" PACKAGE_VERSION="5.3.9~20190523"
CLEAN="'make' clean" CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=8188eu BUILT_MODULE_NAME[0]=8188eu
PROCS_NUM=`nproc` PROCS_NUM=`nproc`

33
os_dep/linux/os_intfs.c
View File

@ -1289,26 +1289,27 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
} }
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0))
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) struct net_device *sb_dev)
, void *accel_priv #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
#else static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
, struct net_device *sb_dev struct net_device *sb_dev,
#endif select_queue_fallback_t fallback)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) #else
, select_queue_fallback_t fallback static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
#endif void *accel_priv, select_queue_fallback_t fallback)
#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;
skb->priority = rtw_classify8021d(skb); skb->priority = rtw_classify8021d(skb);
if (pmlmepriv->acm_mask != 0) if(pmlmepriv->acm_mask != 0)
{
skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority); skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority);
}
return rtw_1d_to_queue[skb->priority]; return rtw_1d_to_queue[skb->priority];
} }
@ -1676,10 +1677,6 @@ void rtw_os_ndev_unregister(_adapter *adapter)
#endif #endif
if ((adapter->DriverState != DRIVER_DISAPPEAR) && netdev) { if ((adapter->DriverState != DRIVER_DISAPPEAR) && netdev) {
#ifdef CONFIG_IOCTL_CFG80211
struct wireless_dev *wdev = padapter->rtw_wdev;
wdev->current_bss = NULL;
#endif
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj); u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
@ -3557,11 +3554,11 @@ static int netdev_close(struct net_device *pnetdev)
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
wdev->iftype = NL80211_IFTYPE_STATION; //wdev->iftype = NL80211_IFTYPE_STATION;
rtw_scan_abort(padapter); rtw_scan_abort(padapter);
rtw_cfg80211_wait_scan_req_empty(padapter, 200); rtw_cfg80211_wait_scan_req_empty(padapter, 200);
adapter_wdev_data(padapter)->bandroid_scan = _FALSE; adapter_wdev_data(padapter)->bandroid_scan = _FALSE;
padapter->rtw_wdev->iftype = NL80211_IFTYPE_STATION; /* set this at the end */ //padapter->rtw_wdev->iftype = NL80211_IFTYPE_STATION; /* set this at the end */
#endif /* CONFIG_IOCTL_CFG80211 */ #endif /* CONFIG_IOCTL_CFG80211 */
#ifdef CONFIG_WAPI_SUPPORT #ifdef CONFIG_WAPI_SUPPORT

6
os_dep/osdep_service.c
View File

@ -2147,7 +2147,7 @@ static int isFileReadable(const char *path, u32 *sz)
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
else { else {
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(KERNEL_DS);
if (1 != readFile(fp, &buf, 1)) if (1 != readFile(fp, &buf, 1))
ret = PTR_ERR(fp); ret = PTR_ERR(fp);
@ -2185,7 +2185,7 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(KERNEL_DS);
ret = readFile(fp, buf, sz); ret = readFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
@ -2220,7 +2220,7 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(KERNEL_DS);
ret = writeFile(fp, buf, sz); ret = writeFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);