diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-09 22:31:28 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-09 22:31:28 +0200 |
| commit | dd987cb45875fa51fbfdefebac801bbe2d66f3e8 (patch) | |
| tree | 4b2437a9eea784ee5a0e00199b452c3311c7649e /modules/hardware | |
| parent | 8c944f594e83f31b96a5a05ea2a7706a0305d4ec (diff) | |
hardware/rtl8192cu: Fix build against 4.x kernels
This fix is more or less because of GCC 5 rather than just against kernel 4.x, because the number of arguments for rtw_select_queue() have been changed since 4.0 already. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/hardware')
| -rw-r--r-- | modules/hardware/rtl8192cu/default.nix | 3 | ||||
| -rw-r--r-- | modules/hardware/rtl8192cu/kernel-4.x.patch | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/modules/hardware/rtl8192cu/default.nix b/modules/hardware/rtl8192cu/default.nix index 8e4619a4..2acfa0ec 100644 --- a/modules/hardware/rtl8192cu/default.nix +++ b/modules/hardware/rtl8192cu/default.nix @@ -15,6 +15,9 @@ let sha256 = "0v0rrxfmvi9flrg3xns826a6n1mlgd3vs5z2x59aqvwfj5b4rv7b"; }; + patches = lib.optional (lib.versionAtLeast kernel.version "4.0") + ./kernel-4.x.patch; + postPatch = '' substituteInPlace Makefile --replace /sbin/depmod : ''; diff --git a/modules/hardware/rtl8192cu/kernel-4.x.patch b/modules/hardware/rtl8192cu/kernel-4.x.patch new file mode 100644 index 00000000..b1b1dc76 --- /dev/null +++ b/modules/hardware/rtl8192cu/kernel-4.x.patch @@ -0,0 +1,14 @@ +diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c +index 3a3cf91..1e4f16e 100755 +--- a/os_dep/linux/os_intfs.c ++++ b/os_dep/linux/os_intfs.c +@@ -949,7 +949,8 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) + return dscp >> 5; + } + +-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb) ++static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, ++ void *accel_priv, select_queue_fallback_t fallback) + { + _adapter *padapter = rtw_netdev_priv(dev); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; |