Browse Source

Sets default compilation system to PC and fixes method signature for Kernel 5.2+ (#303)

pull/307/head
rafaelpierri Harshavardhana 2 years ago
parent
commit
981899f422
2 changed files with 14 additions and 13 deletions
  1. +2
    -2
      Makefile
  2. +12
    -11
      os_dep/linux/os_intfs.c

+ 2
- 2
Makefile View File

@@ -74,9 +74,9 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### Platform Related #######################
# Jeston Nano Headers
# /usr/src/linux-headers-4.9.140-tegra-ubuntu18.04_aarch64/kernel-4.9
CONFIG_PLATFORM_I386_PC = n
CONFIG_PLATFORM_I386_PC = y
CONFIG_PLATFORM_ARM_RPI = n
CONFIG_PLATFORM_ARM_JET_NANO = y
CONFIG_PLATFORM_ARM_JET_NANO = n
CONFIG_PLATFORM_ANDROID_X86 = n
CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
CONFIG_PLATFORM_JB_X86 = n


+ 12
- 11
os_dep/linux/os_intfs.c View File

@@ -686,19 +686,20 @@ 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(3, 13, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
, struct net_device *sb_dev
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(5,2,0))
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
struct net_device *sb_dev)
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(4,19,0))
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
struct net_device *sb_dev,
select_queue_fallback_t fallback)
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(3,14,0))
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
void *accel_priv,
select_queue_fallback_t fallback)
#else
, void *accel_priv
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb)
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
, select_queue_fallback_t fallback
#endif

#endif
)
{
_adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;


Loading…
Cancel
Save