From 1513c8d35757423db6dbd66c47243ed5db5bd3b8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 7 Sep 2016 13:30:23 +0200
Subject: hardware/rtl8192cu: Update to latest Git master

The upstream repository now has support for kernel 4.x, so we no longer
need the patch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/hardware/rtl8192cu/default.nix      |  7 ++-----
 modules/hardware/rtl8192cu/kernel-4.x.patch | 14 --------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 modules/hardware/rtl8192cu/kernel-4.x.patch

(limited to 'modules/hardware')

diff --git a/modules/hardware/rtl8192cu/default.nix b/modules/hardware/rtl8192cu/default.nix
index 0dfb7d53..b1c037c5 100644
--- a/modules/hardware/rtl8192cu/default.nix
+++ b/modules/hardware/rtl8192cu/default.nix
@@ -11,13 +11,10 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "pvaret";
       repo = "rtl8192cu-fixes";
-      rev = "f3edeeef68808f0f6fc06b5e36b559e1d06232ab";
-      sha256 = "0v0rrxfmvi9flrg3xns826a6n1mlgd3vs5z2x59aqvwfj5b4rv7b";
+      rev = "6a58e2f77d75ca9a3b80868a344ed4e2ea1816df";
+      sha256 = "130ym6ag5kgg1hdwpsfpg1i5l08lwqp1ylgjhfyhmz31h92b3h2x";
     };
 
-    patches = lib.optional (lib.versionAtLeast kernel.version "4.0")
-      ./kernel-4.x.patch;
-
     hardeningDisable = [ "stackprotector" "pic" ];
 
     postPatch = ''
diff --git a/modules/hardware/rtl8192cu/kernel-4.x.patch b/modules/hardware/rtl8192cu/kernel-4.x.patch
deleted file mode 100644
index b1b1dc76..00000000
--- a/modules/hardware/rtl8192cu/kernel-4.x.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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;
-- 
cgit 1.4.1