From 3f4c8025cf7a88d1f859dffad783289517ead353 Mon Sep 17 00:00:00 2001 From: moonman Date: Sat, 10 Dec 2016 00:31:21 -0700 Subject: [PATCH] alarm/dkms-8192cu to 1:v4.0.2_9000-1 --- ...g_ids_netgear_dlink.patch => D-link.patch} | 2 +- alarm/dkms-8192cu/HWNUM-300V2.patch | 11 +++ alarm/dkms-8192cu/ISY.patch | 10 +++ alarm/dkms-8192cu/N150MA.patch | 10 +++ alarm/dkms-8192cu/NoDebug.patch | 11 +++ alarm/dkms-8192cu/PKGBUILD | 67 +++++++++++-------- alarm/dkms-8192cu/RTL8192CU-kernel-4.0.patch | 16 +++++ alarm/dkms-8192cu/RTL8192CU-kernel-4.6.patch | 18 +++++ alarm/dkms-8192cu/dkms.conf | 2 +- ...fix_310_proc.patch => fix_310_proc2.patch} | 15 ++--- 10 files changed, 124 insertions(+), 38 deletions(-) rename alarm/dkms-8192cu/{add_missing_ids_netgear_dlink.patch => D-link.patch} (87%) create mode 100644 alarm/dkms-8192cu/HWNUM-300V2.patch create mode 100644 alarm/dkms-8192cu/ISY.patch create mode 100644 alarm/dkms-8192cu/N150MA.patch create mode 100644 alarm/dkms-8192cu/NoDebug.patch create mode 100644 alarm/dkms-8192cu/RTL8192CU-kernel-4.0.patch create mode 100644 alarm/dkms-8192cu/RTL8192CU-kernel-4.6.patch rename alarm/dkms-8192cu/{fix_310_proc.patch => fix_310_proc2.patch} (57%) diff --git a/alarm/dkms-8192cu/add_missing_ids_netgear_dlink.patch b/alarm/dkms-8192cu/D-link.patch similarity index 87% rename from alarm/dkms-8192cu/add_missing_ids_netgear_dlink.patch rename to alarm/dkms-8192cu/D-link.patch index a79a63d4a..0cec4cc86 100644 --- a/alarm/dkms-8192cu/add_missing_ids_netgear_dlink.patch +++ b/alarm/dkms-8192cu/D-link.patch @@ -4,7 +4,7 @@ {USB_DEVICE(0x2001, 0x3307)},/* D-Link - Cameo */ \ {USB_DEVICE(0x2001, 0x330A)},/* D-Link - Alpha */ \ {USB_DEVICE(0x2001, 0x3309)},/* D-Link - Alpha */ \ -+ {USB_DEVICE(0x2001, 0x330D)},/* D-Link - Alpha(?) */ \ ++ {USB_DEVICE(0x2001, 0x330D)},/* D-Link DWA-131 (H/W Ver. B1) */ \ {USB_DEVICE(0x0586, 0x341F)},/* Zyxel - Abocom */ \ {USB_DEVICE(0x7392, 0x7822)},/* Edimax - Edimax */ \ {USB_DEVICE(0x2019, 0xAB2B)},/* Planex - Abocom */ \ diff --git a/alarm/dkms-8192cu/HWNUM-300V2.patch b/alarm/dkms-8192cu/HWNUM-300V2.patch new file mode 100644 index 000000000..55f07c091 --- /dev/null +++ b/alarm/dkms-8192cu/HWNUM-300V2.patch @@ -0,0 +1,11 @@ +--- a/os_dep/linux/usb_intf.c 2013-09-11 05:56:55.000000000 +0200 ++++ b/os_dep/linux/usb_intf.c 2014-05-04 14:38:49.525964451 +0200 +@@ -99,6 +99,7 @@ + {USB_DEVICE(0x07B8, 0x8189)},/* Abocom - Abocom */ \ + {USB_DEVICE(0x0EB0, 0x9071)},/* NO Brand - Etop */ \ + {USB_DEVICE(0x06F8, 0xE033)},/* Hercules - Edimax */ \ ++ {USB_DEVICE(0x06F8, 0xE035)},/* Hercules - Edimax */ \ + {USB_DEVICE(0x103C, 0x1629)},/* HP - Lite-On ,8188CUS Slim Combo */ \ + {USB_DEVICE(0x2001, 0x3308)},/* D-Link - Alpha */ \ + {USB_DEVICE(0x050D, 0x1102)},/* Belkin - Edimax */ \ + diff --git a/alarm/dkms-8192cu/ISY.patch b/alarm/dkms-8192cu/ISY.patch new file mode 100644 index 000000000..5930ffb83 --- /dev/null +++ b/alarm/dkms-8192cu/ISY.patch @@ -0,0 +1,10 @@ +--- a/os_dep/linux/usb_intf.c 2013-09-11 05:56:55.000000000 +0200 ++++ b/os_dep/linux/usb_intf.c 2014-05-04 20:39:38.623365654 +0200 +@@ -102,6 +102,7 @@ + {USB_DEVICE(0x103C, 0x1629)},/* HP - Lite-On ,8188CUS Slim Combo */ \ + {USB_DEVICE(0x2001, 0x3308)},/* D-Link - Alpha */ \ + {USB_DEVICE(0x050D, 0x1102)},/* Belkin - Edimax */ \ ++ {USB_DEVICE(0x050D, 0x11F2)},/* ISY - Edimax */ \ + {USB_DEVICE(0x2019, 0xAB2A)},/* Planex - Abocom */ \ + {USB_DEVICE(0x20F4, 0x648B)},/* TRENDnet - Cameo */ \ + {USB_DEVICE(0x4855, 0x0090)},/* - Feixun */ \ diff --git a/alarm/dkms-8192cu/N150MA.patch b/alarm/dkms-8192cu/N150MA.patch new file mode 100644 index 000000000..ba7bc8b8d --- /dev/null +++ b/alarm/dkms-8192cu/N150MA.patch @@ -0,0 +1,10 @@ +--- a/os_dep/linux/usb_intf.c 2013-09-11 05:56:55.000000000 +0200 ++++ b/os_dep/linux/usb_intf.c 2014-05-04 14:38:49.525964451 +0200 +@@ -110,6 +110,7 @@ + {USB_DEVICE(0x0BDA, 0x5088)},/* Thinkware - CC&C */ \ + {USB_DEVICE(0x4856, 0x0091)},/* NetweeN - Feixun */ \ + {USB_DEVICE(0x0846, 0x9041)}, /* Netgear - Cameo */ \ ++ {USB_DEVICE(0x0846, 0x9042)}, /* On Networks - N150MA */ \ + {USB_DEVICE(0x2019, 0x4902)},/* Planex - Etop */ \ + {USB_DEVICE(0x2019, 0xAB2E)},/* SW-WF02-AD15 -Abocom */ \ + {USB_DEVICE(0x2001, 0x330B)}, /* D-LINK - T&W */ \ diff --git a/alarm/dkms-8192cu/NoDebug.patch b/alarm/dkms-8192cu/NoDebug.patch new file mode 100644 index 000000000..0b75b2ef8 --- /dev/null +++ b/alarm/dkms-8192cu/NoDebug.patch @@ -0,0 +1,11 @@ +--- a/include/autoconf.h 2014-05-04 14:44:15.059787000 +0200 ++++ b/include/autoconf.h 2014-05-04 14:48:32.517818858 +0200 +@@ -296,7 +296,7 @@ + //#define CONFIG_DEBUG_RTL871X + + #define DBG 0 +-#define CONFIG_DEBUG_RTL819X ++//#define CONFIG_DEBUG_RTL819X + + #define CONFIG_PROC_DEBUG 1 + diff --git a/alarm/dkms-8192cu/PKGBUILD b/alarm/dkms-8192cu/PKGBUILD index 4b16b7989..dc5e49a20 100644 --- a/alarm/dkms-8192cu/PKGBUILD +++ b/alarm/dkms-8192cu/PKGBUILD @@ -1,52 +1,63 @@ -# Maintainer: Runnytu < runnytu at gmail.com > -# Contributor: Christian Hammacher < bmasterc@gmail.com > +# Maintainer: Runnytu < runnytu at gmail dot com > pkgname=dkms-8192cu -pkgver=v4.0.2_9000.20130911 -pkgrel=2 +epoch=1 +pkgver=v4.0.2_9000 +pkgrel=1 pkgdesc="Driver for Realtek RTL8188CUS (8188C, 8192C) chipset wireless cards" -arch=('arm') +arch=('any') url="http://www.realtek.com.tw/" license=('GPL') -depends=('dkms' 'linux-headers') +depends=('dkms') conflicts=("8192cu" "rt8192cu") -install=${pkgname}.install options=(!strip) _pkgname="8192cu" -source=("https://www.dropbox.com/s/61askvmgh6iyh6p/rtl8188C_8192C_usb_linux_$pkgver.tar.gz" - "dkms-8192cu.install" - "fix_310_proc.patch" - "add_missing_ids_netgear_dlink.patch" +source=("https://dl.dropboxusercontent.com/u/54784933/$_pkgname-$pkgver.tar.gz" "dkms.conf" - "blacklist-dkms-8192cu.conf") - -md5sums=('efb71a576f781c3d15531511aac2c5c9' - '82db3ab6573dbe2ede43e49ac35259cb' - '5b764e13afd1ccad5bb14bd4d9633604' - 'cf582713c3a65eaff137feb22d93b61c' - '21077239f17639254b74d74daea8655b' - '5f2d28bf3839447bfe762416a89e1a21') + "blacklist-dkms-8192cu.conf" + "fix_310_proc2.patch" + "NoDebug.patch" + "N150MA.patch" + "ISY.patch" + "D-link.patch" + "HWNUM-300V2.patch" + "RTL8192CU-kernel-4.0.patch" + "RTL8192CU-kernel-4.6.patch") +sha256sums=('f4b83e4a363985fdd313531b2e5688d739d2b6df45c8f50d4d3568489db95a5e' + '84d59e26884bbe28fae92901e088911692f4aac8ce2fa88b3f45d76bc7e63f01' + 'c535e5f1990142355587c212e90e3fc2f1d16540eaafbc7fb7fa54581d70ff37' + '976394ef3ee5d29023e8c1f3b56b17a6171bf42b6987256c1cda632db4bb19a4' + '9220833471c1a64e69cb53ec7d2c6872857e5c1ae396bfa4a6522e60711961cc' + '5cf2242e253e1a86d7d4481e87d354f591462f50f37e06ba229c344ebe114eac' + 'a8098039d910a6e16dbc6fe770551edb108fe784f65e9fd8edd930851e993388' + '0170cab166bc3a4775099402ceea245a84500741afb23bd9572f40958c6e7b40' + '0c87129f7a0bfb718de0962b1515eda5cf91cfc8b0a9c0e2c25df111552f4a99' + '63c4188d620ad613562a00b635167e4762d5dc3ca909ebc3709cca433d34ffd8' + 'f88b3669a938514cb084493a2635ac250087fb08be7cc2690d60b47e5d213bcb') package() { installDir="$pkgdir/usr/src/$_pkgname-$pkgver" install -dm755 "$installDir" - install -m644 "$srcdir/dkms.conf" "$installDir/dkms.conf" + install -m644 "$srcdir/dkms.conf" "$installDir" install -dm755 "$pkgdir/etc/modprobe.d" - install -m644 "$srcdir/blacklist-dkms-8192cu.conf" "$pkgdir/etc/modprobe.d/blacklist-dkms-8192cu.conf" + install -m644 "$srcdir/blacklist-dkms-8192cu.conf" "$pkgdir/etc/modprobe.d/blacklist-8192cu-dkms.conf" - cd "${srcdir}/rtl8188C_8192C_usb_linux_${pkgver}/" + cd "${srcdir}/${_pkgname}-${pkgver}/" - patch -p1 -i "$srcdir/fix_310_proc.patch" - patch -p1 -i "$srcdir/add_missing_ids_netgear_dlink.patch" + patch -p1 -i "$srcdir/fix_310_proc2.patch" + patch -p1 -i "$srcdir/N150MA.patch" + patch -p1 -i "$srcdir/NoDebug.patch" + patch -p1 -i "$srcdir/ISY.patch" + patch -p1 -i "$srcdir/D-link.patch" + patch -p1 -i "$srcdir/HWNUM-300V2.patch" + patch -p1 -i "$srcdir/RTL8192CU-kernel-4.0.patch" + patch -p1 -i "$srcdir/RTL8192CU-kernel-4.6.patch" # Disable power saving sed -i 's/^CONFIG_POWER_SAVING \= y/CONFIG_POWER_SAVING = n/' Makefile - # Fix __TIME__ macros error - sed -i 's/^#define CONFIG_DEBUG_RTL819X/\ /' include/autoconf.h - for d in `find . -type d` do install -dm755 "$installDir/$d" @@ -54,7 +65,7 @@ package() { for f in `find . -type f` do - install -m644 "${srcdir}/rtl8188C_8192C_usb_linux_${pkgver}/$f" "$installDir/$f" + install -m644 "${srcdir}/${_pkgname}-${pkgver}/$f" "$installDir/$f" done } diff --git a/alarm/dkms-8192cu/RTL8192CU-kernel-4.0.patch b/alarm/dkms-8192cu/RTL8192CU-kernel-4.0.patch new file mode 100644 index 000000000..cc08e9b02 --- /dev/null +++ b/alarm/dkms-8192cu/RTL8192CU-kernel-4.0.patch @@ -0,0 +1,16 @@ +diff -Naur RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/rtw_android.c RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/rtw_android.c +--- RTL8192CU-v4.0.2_9000.20130911/os_dep/linux/rtw_android.c 2013-09-11 05:56:55.000000000 +0200 ++++ RTL8192CU-v4.0.2_9000.20130911.patch/os_dep/linux/rtw_android.c 2015-04-04 20:20:23.779119031 +0200 +@@ -230,7 +230,11 @@ + { + int cmd_num; + for(cmd_num=0 ; cmd_num= KERNEL_VERSION(4, 0, 0)) ++ if(!strncasecmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])) ) ++#else + if(0 == strnicmp(cmdstr , android_wifi_cmd_str[cmd_num], strlen(android_wifi_cmd_str[cmd_num])) ) ++#endif + break; + + return cmd_num; + diff --git a/alarm/dkms-8192cu/RTL8192CU-kernel-4.6.patch b/alarm/dkms-8192cu/RTL8192CU-kernel-4.6.patch new file mode 100644 index 000000000..303ec8fec --- /dev/null +++ b/alarm/dkms-8192cu/RTL8192CU-kernel-4.6.patch @@ -0,0 +1,18 @@ +diff -Naur a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c +--- a/os_dep/linux/os_intfs.c 2016-04-19 11:17:44.465411644 -0700 ++++ b/os_dep/linux/os_intfs.c 2016-04-19 11:23:24.742014169 -0700 +@@ -958,7 +958,13 @@ + return dscp >> 5; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) ++static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, ++ 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; + diff --git a/alarm/dkms-8192cu/dkms.conf b/alarm/dkms-8192cu/dkms.conf index cf4db12ed..91d166dfb 100644 --- a/alarm/dkms-8192cu/dkms.conf +++ b/alarm/dkms-8192cu/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="8192cu" -PACKAGE_VERSION="v4.0.2_9000.20130911" +PACKAGE_VERSION="v4.0.2_9000" MAKE[0]="cd $dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build; make ARCH=arm modules" BUILT_MODULE_NAME[0]="8192cu" DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless" diff --git a/alarm/dkms-8192cu/fix_310_proc.patch b/alarm/dkms-8192cu/fix_310_proc2.patch similarity index 57% rename from alarm/dkms-8192cu/fix_310_proc.patch rename to alarm/dkms-8192cu/fix_310_proc2.patch index 1b2872ebb..40cb8e33e 100644 --- a/alarm/dkms-8192cu/fix_310_proc.patch +++ b/alarm/dkms-8192cu/fix_310_proc2.patch @@ -1,11 +1,10 @@ ---- ./os_dep/linux/os_intfs.c 2013-11-11 20:42:46.783120135 +0100 -+++ ./os_dep/linux/os_intfs.c 2013-11-11 20:42:07.226118726 +0100 -@@ -277,6 +277,19 @@ +--- a/os_dep/linux/os_intfs.c 2013-09-11 05:56:55.000000000 +0200 ++++ b/os_dep/linux/os_intfs.c 2013-11-12 00:30:41.158248277 +0100 +@@ -277,6 +277,18 @@ #define RTW_PROC_NAME DRV_NAME +#ifndef create_proc_entry -+ +/* dummy routines */ +void rtw_proc_remove_one(struct net_device *dev) +{ @@ -15,16 +14,16 @@ +{ +} + -+#else /* create_proc_entry not defined */ ++#else /* create_proc_entry not defined */ + void rtw_proc_init_one(struct net_device *dev) { struct proc_dir_entry *dir_dev = NULL; -@@ -752,6 +765,7 @@ +@@ -751,6 +763,7 @@ + } } } ++#endif /* create_proc_entry not defined */ #endif -+#endif uint loadparam( _adapter *padapter, _nic_hdl pnetdev); - uint loadparam( _adapter *padapter, _nic_hdl pnetdev)