From 6d603e529a5b58cf3e1692e1cc1cb50f0ae723c3 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 22 May 2016 13:53:58 -0500 Subject: [PATCH] Add #if for 3.14 kernel change (#87) Fixes compiling after changes in https://github.com/torvalds/linux/commit/f663dd9aaf9ed124f25f0f8452edf238f087ad50 and https://github.com/torvalds/linux/commit/99932d4fc03a13bb3e94938fe25458fabc8f2fc3 Fixes #86 --- .../net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c index 3854f27f833fa..6c2d81751746b 100644 --- a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c @@ -945,8 +945,13 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) return dscp >> 5; } +#if (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) + void *accel_priv, + select_queue_fallback_t fallback) +#else +static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb) +#endif { _adapter *padapter = rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv;