Date: Wednesday, September 4, 2013 @ 06:47:13 Author: foutrelis Revision: 96749
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: rt3562sta/repos/community-testing-i686/ rt3562sta/repos/community-testing-i686/PKGBUILD (from rev 96748, rt3562sta/trunk/PKGBUILD) rt3562sta/repos/community-testing-i686/linux-3.8.patch (from rev 96748, rt3562sta/trunk/linux-3.8.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-WPA-mixed.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-config.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-config.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-reduce_debug_output.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove_date_time.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-return_nonvoid.patch) rt3562sta/repos/community-testing-i686/rt3562sta.install (from rev 96748, rt3562sta/trunk/rt3562sta.install) rt3562sta/repos/community-testing-x86_64/ rt3562sta/repos/community-testing-x86_64/PKGBUILD (from rev 96748, rt3562sta/trunk/PKGBUILD) rt3562sta/repos/community-testing-x86_64/linux-3.8.patch (from rev 96748, rt3562sta/trunk/linux-3.8.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-WPA-mixed.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-config.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-config.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-reduce_debug_output.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove_date_time.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove_date_time.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-return_nonvoid.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-return_nonvoid.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta.install (from rev 96748, rt3562sta/trunk/rt3562sta.install) --------------------------------------------------------------------------------------------+ community-testing-i686/PKGBUILD | 88 ++++++++ community-testing-i686/linux-3.8.patch | 50 +++++ community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch | 11 + community-testing-i686/rt3562sta-2.4.1.1-config.patch | 98 ++++++++++ community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch | 13 + community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch | 14 + community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch | 15 + community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch | 47 ++++ community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch | 11 + community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch | 11 + community-testing-i686/rt3562sta.install | 16 + community-testing-x86_64/PKGBUILD | 88 ++++++++ community-testing-x86_64/linux-3.8.patch | 50 +++++ community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch | 11 + community-testing-x86_64/rt3562sta-2.4.1.1-config.patch | 98 ++++++++++ community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch | 13 + community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch | 14 + community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch | 15 + community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch | 47 ++++ community-testing-x86_64/rt3562sta-2.4.1.1-remove_date_time.patch | 11 + community-testing-x86_64/rt3562sta-2.4.1.1-return_nonvoid.patch | 11 + community-testing-x86_64/rt3562sta.install | 16 + 22 files changed, 748 insertions(+) Copied: rt3562sta/repos/community-testing-i686/PKGBUILD (from rev 96748, rt3562sta/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,88 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless + +pkgname=rt3562sta +pkgver=2.4.1.1 +pkgrel=43 +pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" +arch=(i686 x86_64) +url="http://www.mediatek.com/en/Products/support.php?sn=501" +license=('GPL') +depends=('linux') +makedepends=('linux-headers') +install=$pkgname.install +source=( + http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz + $pkgname-$pkgver-config.patch + $pkgname-$pkgver-gcc-warnings-x86_64.patch + $pkgname-$pkgver-WPA-mixed.patch + $pkgname-$pkgver-convert-devicename-to-wlanX.patch + $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch + $pkgname-$pkgver-return_nonvoid.patch + $pkgname-$pkgver-reduce_debug_output.patch + $pkgname-$pkgver-remove_date_time.patch + linux-3.8.patch +) + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" + [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" + patch -p1 -i "$srcdir/linux-3.8.patch" + + # clean up this mess of mixing RT2860STA with RT3562STA + # in documentation files + mv RT2860STA.dat RT3562STA.dat + mv RT2860STACard.dat RT3562STACard.dat + sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt + + # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too + sed -i 's|ra0|wlan0|g' *.txt README* *.dat + sed -i 's|ra1|wlan1|g' *.txt README* *.dat + sed -i 's|ra2|wlan2|g' *.txt README* *.dat + + export EXTRA_CFLAGS="-DVERSION=$pkgver" + + # this Makefile is far too strict... + echo "LINUX_SRC = /usr/lib/modules/$KERNEL_RELEASE/build" >> Makefile + + make +} + +package() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + msg "Kernel = $KERNEL_VERSION" + + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + + install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" + install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" + install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" + install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" + + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; + sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" +} + +sha256sums=('71cd27784009894198f03470ec88e77f2cd176bf5f8d93b4dd984d3a3e543d5a' + 'b1465fceaac99f26cc0e7db0562d2bf103b57656f0b7b57e404f59efb3373b27' + 'd013ed5981a02be27b4aaf1e03670d68dbb16f40d9eb84930e58a96fc38ef947' + 'c962d014ea6e84a8c3398ff13e4709cc309c29134cac0b5c702eab1026799887' + 'e966d96026baee0447d6ad26742bcc40baa3f94530573d58f4eca842e107f809' + '7d2a83edfe6664a8e923dcda636c871220efc7ff4a82ab76a62fc97a11f2fcaa' + 'd672b58cdb278e3ecaeb46f3e5e477e1da7d2fd5dbf896521a4d0993743b9ab9' + '4d1d5eb5c22d356af62f4f55d12b04eb8a557ea9c664edfbc79c9e0454ccca4e' + 'a888d045b142127070c2c23ed1a84306d5202896265c828cf7e125ec2dd52389' + 'ce44f33ab9e0cb407718e3bef14b70be9c5fe6636cf8a483c1d8c891c6bfdbd8') Copied: rt3562sta/repos/community-testing-i686/linux-3.8.patch (from rev 96748, rt3562sta/trunk/linux-3.8.patch) =================================================================== --- community-testing-i686/linux-3.8.patch (rev 0) +++ community-testing-i686/linux-3.8.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,50 @@ +diff -upr DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217.orig/os/linux/pci_main_dev.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c +--- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217.orig/os/linux/pci_main_dev.c 2013-02-21 03:35:12.000000000 +0200 ++++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c 2013-02-21 03:39:17.000000000 +0200 +@@ -34,8 +34,8 @@ + extern int rt28xx_close(IN struct net_device *net_dev); + extern int rt28xx_open(struct net_device *net_dev); + +-static VOID __devexit rt2860_remove_one(struct pci_dev *pci_dev); +-static INT __devinit rt2860_probe(struct pci_dev *pci_dev, const struct pci_device_id *ent); ++static VOID rt2860_remove_one(struct pci_dev *pci_dev); ++static INT rt2860_probe(struct pci_dev *pci_dev, const struct pci_device_id *ent); + static void __exit rt2860_cleanup_module(void); + static int __init rt2860_init_module(void); + +@@ -57,7 +57,7 @@ static int rt2860_resume(struct pci_dev + // + // Ralink PCI device table, include all supported chipsets + // +-static struct pci_device_id rt2860_pci_tbl[] __devinitdata = ++static struct pci_device_id rt2860_pci_tbl[] = + { + #ifdef RT2860 + {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2860_PCI_DEVICE_ID)}, //RT28602.4G +@@ -101,7 +101,7 @@ static struct pci_driver rt2860_driver = + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +- remove: __devexit_p(rt2860_remove_one), ++ remove: rt2860_remove_one, + #else + remove: __devexit(rt2860_remove_one), + #endif +@@ -294,7 +294,7 @@ module_exit(rt2860_cleanup_module); + // + // PCI device probe & initialization function + // +-static INT __devinit rt2860_probe( ++static INT rt2860_probe( + IN struct pci_dev *pci_dev, + IN const struct pci_device_id *pci_id) + { +@@ -468,7 +468,7 @@ err_out: + } + + +-static VOID __devexit rt2860_remove_one( ++static VOID rt2860_remove_one( + IN struct pci_dev *pci_dev) + { + PNET_DEV net_dev = pci_get_drvdata(pci_dev); Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-WPA-mixed.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,11 @@ +--- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 +@@ -2410,7 +2410,7 @@ + UCHAR PrimaryRsnie; + BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different + UCHAR p_offset; +- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode ++ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode + + rsnielen_cur_p = NULL; + rsnielen_ex_cur_p = NULL; Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-config.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-config.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-config.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-config.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,98 @@ +--- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 +@@ -9,10 +9,10 @@ + + + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + + #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n +@@ -283,7 +283,7 @@ + endif + + ifeq ($(CHIPSET),3562) +-WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT ++WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 + ifeq ($(HAS_DFS_SUPPORT),y) + WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG + endif +--- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 ++++ Makefile 2010-12-17 19:51:39.000000000 +0100 +@@ -284,26 +284,26 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot + endif + ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net ++# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot + endif + endif + endif +@@ -331,25 +331,25 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot + endif + rm -f os/linux/rt$(CHIPSET)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot + endif + endif + endif Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,13 @@ +--- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 +@@ -1451,8 +1451,8 @@ + #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) + #endif // CLIENT_WDS // + +-#define INF_MAIN_DEV_NAME "ra" +-#define INF_MBSSID_DEV_NAME "ra" ++#define INF_MAIN_DEV_NAME "wlan" ++#define INF_MBSSID_DEV_NAME "wlan" + #define INF_WDS_DEV_NAME "wds" + #define INF_APCLI_DEV_NAME "apcli" + #define INF_MESH_DEV_NAME "mesh" Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,14 @@ +--- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 +@@ -479,9 +479,9 @@ + MEM_DBG_PKT_ALLOC_INC(pAd); + + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-reduce_debug_output.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,15 @@ +--- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 ++++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 +@@ -611,10 +611,10 @@ + + #define DBGPRINT_RAW(Level, Fmt) \ + do{ \ +- if (Level <= RTDebugLevel) \ ++/* if (Level <= RTDebugLevel) \ + { \ + printk Fmt; \ +- } \ ++ }*/ \ + }while(0) + + #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove_date_time.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,11 @@ +--- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 +@@ -1812,7 +1812,7 @@ + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + case SHOW_DRVIER_VERION: +- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); ++ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + #ifdef DOT11_N_SUPPORT Copied: rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-return_nonvoid.patch) =================================================================== --- community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch (rev 0) +++ community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,11 @@ +--- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 +@@ -1247,7 +1247,7 @@ + RTMP_OS_TASK *pTask; + + if (pAd->bWriteDat == FALSE) +- return; ++ return 0; + + DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); + Copied: rt3562sta/repos/community-testing-i686/rt3562sta.install (from rev 96748, rt3562sta/trunk/rt3562sta.install) =================================================================== --- community-testing-i686/rt3562sta.install (rev 0) +++ community-testing-i686/rt3562sta.install 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,16 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.11-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies +} + +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} Copied: rt3562sta/repos/community-testing-x86_64/PKGBUILD (from rev 96748, rt3562sta/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,88 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless + +pkgname=rt3562sta +pkgver=2.4.1.1 +pkgrel=43 +pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" +arch=(i686 x86_64) +url="http://www.mediatek.com/en/Products/support.php?sn=501" +license=('GPL') +depends=('linux') +makedepends=('linux-headers') +install=$pkgname.install +source=( + http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz + $pkgname-$pkgver-config.patch + $pkgname-$pkgver-gcc-warnings-x86_64.patch + $pkgname-$pkgver-WPA-mixed.patch + $pkgname-$pkgver-convert-devicename-to-wlanX.patch + $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch + $pkgname-$pkgver-return_nonvoid.patch + $pkgname-$pkgver-reduce_debug_output.patch + $pkgname-$pkgver-remove_date_time.patch + linux-3.8.patch +) + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" + [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" + patch -p1 -i "$srcdir/linux-3.8.patch" + + # clean up this mess of mixing RT2860STA with RT3562STA + # in documentation files + mv RT2860STA.dat RT3562STA.dat + mv RT2860STACard.dat RT3562STACard.dat + sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt + + # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too + sed -i 's|ra0|wlan0|g' *.txt README* *.dat + sed -i 's|ra1|wlan1|g' *.txt README* *.dat + sed -i 's|ra2|wlan2|g' *.txt README* *.dat + + export EXTRA_CFLAGS="-DVERSION=$pkgver" + + # this Makefile is far too strict... + echo "LINUX_SRC = /usr/lib/modules/$KERNEL_RELEASE/build" >> Makefile + + make +} + +package() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) + msg "Kernel = $KERNEL_VERSION" + + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + + install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" + install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" + install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" + install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" + + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; + sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" +} + +sha256sums=('71cd27784009894198f03470ec88e77f2cd176bf5f8d93b4dd984d3a3e543d5a' + 'b1465fceaac99f26cc0e7db0562d2bf103b57656f0b7b57e404f59efb3373b27' + 'd013ed5981a02be27b4aaf1e03670d68dbb16f40d9eb84930e58a96fc38ef947' + 'c962d014ea6e84a8c3398ff13e4709cc309c29134cac0b5c702eab1026799887' + 'e966d96026baee0447d6ad26742bcc40baa3f94530573d58f4eca842e107f809' + '7d2a83edfe6664a8e923dcda636c871220efc7ff4a82ab76a62fc97a11f2fcaa' + 'd672b58cdb278e3ecaeb46f3e5e477e1da7d2fd5dbf896521a4d0993743b9ab9' + '4d1d5eb5c22d356af62f4f55d12b04eb8a557ea9c664edfbc79c9e0454ccca4e' + 'a888d045b142127070c2c23ed1a84306d5202896265c828cf7e125ec2dd52389' + 'ce44f33ab9e0cb407718e3bef14b70be9c5fe6636cf8a483c1d8c891c6bfdbd8') Copied: rt3562sta/repos/community-testing-x86_64/linux-3.8.patch (from rev 96748, rt3562sta/trunk/linux-3.8.patch) =================================================================== --- community-testing-x86_64/linux-3.8.patch (rev 0) +++ community-testing-x86_64/linux-3.8.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,50 @@ +diff -upr DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217.orig/os/linux/pci_main_dev.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c +--- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217.orig/os/linux/pci_main_dev.c 2013-02-21 03:35:12.000000000 +0200 ++++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c 2013-02-21 03:39:17.000000000 +0200 +@@ -34,8 +34,8 @@ + extern int rt28xx_close(IN struct net_device *net_dev); + extern int rt28xx_open(struct net_device *net_dev); + +-static VOID __devexit rt2860_remove_one(struct pci_dev *pci_dev); +-static INT __devinit rt2860_probe(struct pci_dev *pci_dev, const struct pci_device_id *ent); ++static VOID rt2860_remove_one(struct pci_dev *pci_dev); ++static INT rt2860_probe(struct pci_dev *pci_dev, const struct pci_device_id *ent); + static void __exit rt2860_cleanup_module(void); + static int __init rt2860_init_module(void); + +@@ -57,7 +57,7 @@ static int rt2860_resume(struct pci_dev + // + // Ralink PCI device table, include all supported chipsets + // +-static struct pci_device_id rt2860_pci_tbl[] __devinitdata = ++static struct pci_device_id rt2860_pci_tbl[] = + { + #ifdef RT2860 + {PCI_DEVICE(NIC_PCI_VENDOR_ID, NIC2860_PCI_DEVICE_ID)}, //RT28602.4G +@@ -101,7 +101,7 @@ static struct pci_driver rt2860_driver = + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +- remove: __devexit_p(rt2860_remove_one), ++ remove: rt2860_remove_one, + #else + remove: __devexit(rt2860_remove_one), + #endif +@@ -294,7 +294,7 @@ module_exit(rt2860_cleanup_module); + // + // PCI device probe & initialization function + // +-static INT __devinit rt2860_probe( ++static INT rt2860_probe( + IN struct pci_dev *pci_dev, + IN const struct pci_device_id *pci_id) + { +@@ -468,7 +468,7 @@ err_out: + } + + +-static VOID __devexit rt2860_remove_one( ++static VOID rt2860_remove_one( + IN struct pci_dev *pci_dev) + { + PNET_DEV net_dev = pci_get_drvdata(pci_dev); Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-WPA-mixed.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,11 @@ +--- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 +@@ -2410,7 +2410,7 @@ + UCHAR PrimaryRsnie; + BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different + UCHAR p_offset; +- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode ++ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode + + rsnielen_cur_p = NULL; + rsnielen_ex_cur_p = NULL; Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-config.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-config.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-config.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-config.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,98 @@ +--- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 +@@ -9,10 +9,10 @@ + + + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + + #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n +@@ -283,7 +283,7 @@ + endif + + ifeq ($(CHIPSET),3562) +-WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT ++WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 + ifeq ($(HAS_DFS_SUPPORT),y) + WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG + endif +--- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 ++++ Makefile 2010-12-17 19:51:39.000000000 +0100 +@@ -284,26 +284,26 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot + endif + ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net ++# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot + endif + endif + endif +@@ -331,25 +331,25 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot + endif + rm -f os/linux/rt$(CHIPSET)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot + endif + endif + endif Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,13 @@ +--- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 +@@ -1451,8 +1451,8 @@ + #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) + #endif // CLIENT_WDS // + +-#define INF_MAIN_DEV_NAME "ra" +-#define INF_MBSSID_DEV_NAME "ra" ++#define INF_MAIN_DEV_NAME "wlan" ++#define INF_MBSSID_DEV_NAME "wlan" + #define INF_WDS_DEV_NAME "wds" + #define INF_APCLI_DEV_NAME "apcli" + #define INF_MESH_DEV_NAME "mesh" Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,14 @@ +--- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 +@@ -479,9 +479,9 @@ + MEM_DBG_PKT_ALLOC_INC(pAd); + + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-reduce_debug_output.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,15 @@ +--- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 ++++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 +@@ -611,10 +611,10 @@ + + #define DBGPRINT_RAW(Level, Fmt) \ + do{ \ +- if (Level <= RTDebugLevel) \ ++/* if (Level <= RTDebugLevel) \ + { \ + printk Fmt; \ +- } \ ++ }*/ \ + }while(0) + + #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove_date_time.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-remove_date_time.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-remove_date_time.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-remove_date_time.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,11 @@ +--- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 +@@ -1812,7 +1812,7 @@ + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + case SHOW_DRVIER_VERION: +- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); ++ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + #ifdef DOT11_N_SUPPORT Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-return_nonvoid.patch (from rev 96748, rt3562sta/trunk/rt3562sta-2.4.1.1-return_nonvoid.patch) =================================================================== --- community-testing-x86_64/rt3562sta-2.4.1.1-return_nonvoid.patch (rev 0) +++ community-testing-x86_64/rt3562sta-2.4.1.1-return_nonvoid.patch 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,11 @@ +--- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 +@@ -1247,7 +1247,7 @@ + RTMP_OS_TASK *pTask; + + if (pAd->bWriteDat == FALSE) +- return; ++ return 0; + + DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); + Copied: rt3562sta/repos/community-testing-x86_64/rt3562sta.install (from rev 96748, rt3562sta/trunk/rt3562sta.install) =================================================================== --- community-testing-x86_64/rt3562sta.install (rev 0) +++ community-testing-x86_64/rt3562sta.install 2013-09-04 04:47:13 UTC (rev 96749) @@ -0,0 +1,16 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.11-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies +} + +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +}