mirror of
https://github.com/gnab/rtl8812au
synced 2025-01-08 17:46:23 +00:00
os_intfs.c: linux-5.2: disable fallback from rtw_select_queue
osdep_service.c: Replaced get_ds() with KERNEL_DS
This commit is contained in:
parent
2eb86a8349
commit
89b8d132c3
@ -1010,13 +1010,15 @@ 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(4, 19, 0))
|
||||
, struct net_device *unused
|
||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
|
||||
, void *unused
|
||||
#endif
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
|
||||
, void *accel_priv
|
||||
#else
|
||||
, struct net_device *sb_dev
|
||||
#endif
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
|
||||
, select_queue_fallback_t fallback
|
||||
#endif
|
||||
#endif
|
||||
){
|
||||
_adapter *padapter = rtw_netdev_priv(dev);
|
||||
|
@ -1556,7 +1556,7 @@ static int isFileReadable(char *path)
|
||||
ret = PTR_ERR(fp);
|
||||
}
|
||||
else {
|
||||
oldfs = get_fs(); set_fs(get_ds());
|
||||
oldfs = get_fs(); set_fs(KERNEL_DS);
|
||||
|
||||
if(1!=readFile(fp, &buf, 1))
|
||||
ret = PTR_ERR(fp);
|
||||
@ -1584,7 +1584,7 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
|
||||
if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
|
||||
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
|
||||
|
||||
oldfs = get_fs(); set_fs(get_ds());
|
||||
oldfs = get_fs(); set_fs(KERNEL_DS);
|
||||
ret=readFile(fp, buf, sz);
|
||||
set_fs(oldfs);
|
||||
closeFile(fp);
|
||||
@ -1618,7 +1618,7 @@ static int storeToFile(char *path, u8* buf, u32 sz)
|
||||
if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
|
||||
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
|
||||
|
||||
oldfs = get_fs(); set_fs(get_ds());
|
||||
oldfs = get_fs(); set_fs(KERNEL_DS);
|
||||
ret=writeFile(fp, buf, sz);
|
||||
set_fs(oldfs);
|
||||
closeFile(fp);
|
||||
|
Loading…
Reference in New Issue
Block a user