[arch-commits] CVS update of unstable/modules/rt2x00-cvs-suspend2 (3 files)

daniel at archlinux.org daniel at archlinux.org
Sun Aug 26 10:46:57 UTC 2007


    Date: Sunday, August 26, 2007 @ 06:46:57
  Author: daniel
    Path: /home/cvs-unstable/unstable/modules/rt2x00-cvs-suspend2

   Added: config (1.1) rt2x00-mac80211.patch (1.1)
Modified: PKGBUILD (1.9 -> 1.10)

upgpkg: rt2x00-cvs-suspend2 20070826-1


-----------------------+
 PKGBUILD              |   23 ++++++++++------
 config                |   59 +++++++++++++++++++++++++++++++++++++++++++
 rt2x00-mac80211.patch |   65 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 138 insertions(+), 9 deletions(-)


Index: unstable/modules/rt2x00-cvs-suspend2/PKGBUILD
diff -u unstable/modules/rt2x00-cvs-suspend2/PKGBUILD:1.9 unstable/modules/rt2x00-cvs-suspend2/PKGBUILD:1.10
--- unstable/modules/rt2x00-cvs-suspend2/PKGBUILD:1.9	Mon Aug 20 22:40:38 2007
+++ unstable/modules/rt2x00-cvs-suspend2/PKGBUILD	Sun Aug 26 06:46:57 2007
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD,v 1.9 2007/08/21 02:40:38 travis Exp $
+# $Id: PKGBUILD,v 1.10 2007/08/26 10:46:57 daniel Exp $
 # Maintainer : James Rayner <iphitus at gmail.com>
 pkgname=rt2x00-cvs-suspend2
-_kernver=2.6.19-suspend2
-pkgver=20070409
+_kernver=2.6.22-suspend2
+pkgver=20070826
 pkgrel=1
 pkgdesc="Open Source modules for Ralink wireless chipsets"
 arch=('i686' 'x86_64')
 url="http://rt2x00.serialmonkey.com"
-license=('GPL')
 install="rt2x00.install"
-depends=('kernel26suspend2')
+depends=('kernel26')
 source=()
-replaces=("rt2x00-suspend2")
-conflicts=("rt2x00-suspend2")
-provides=("rt2x00-suspend2")
+replaces=("rt2x00")
+conflicts=("rt2x00")
+provides=("rt2x00")
+source=(config rt2x00-mac80211.patch)
+md5sums=('ca9a8c77659e05b69d31603cbae8bb17'
+         'd1eccb251bb24da65ef1cb1677b3cc6e')
 
 _cvsroot=":pserver:anonymous:@rt2400.cvs.sourceforge.net:/cvsroot/rt2400"
 _cvsmod="source/rt2x00"
@@ -25,7 +27,10 @@
   cvs -z3 -d $_cvsroot co -D $pkgver -f $_cvsmod
   cd $_cvsmod
 
-  make KERNDIR=/lib/modules/${_kernver}/build 
+  patch -Np1 -i $startdir/src/rt2x00-mac80211.patch
+
+  cp $startdir/src/config .
+  make KERNDIR=/lib/modules/${_kernver}/build || return 1
 
   mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/rt2x00
   install -m644 $startdir/src/$_cvsmod/*ko \
Index: unstable/modules/rt2x00-cvs-suspend2/config
diff -u /dev/null unstable/modules/rt2x00-cvs-suspend2/config:1.1
--- /dev/null	Sun Aug 26 06:46:57 2007
+++ unstable/modules/rt2x00-cvs-suspend2/config	Sun Aug 26 06:46:57 2007
@@ -0,0 +1,59 @@
+# rt2x00 configuration
+# All configuration options can be enabled
+# by setting the value to 'y'. To disable
+# the option it should be set to 'n'.
+
+#
+# RT2X00 generic support
+#
+
+# Enable rt2x00 support
+CONFIG_RT2X00=y
+# Enable rt2x00 debug output
+CONFIG_RT2X00_DEBUG=y
+# Enable rt2x00 debugfs support
+CONFIG_RT2X00_LIB_DEBUGFS=n
+# Enable rt2x00 asm file creation
+CONFIG_RT2X00_ASM=n
+
+#
+# RT2X00 driver support
+#
+# Enable rt2400pci support
+CONFIG_RT2400PCI=y
+# Enable rt2400pci hardware button support (requires rfkill)
+CONFIG_RT2400PCI_BUTTON=y
+
+# Enable rt2500pci support
+CONFIG_RT2500PCI=y
+# Enable rt2500pci hardware button support (requires rfkill)
+CONFIG_RT2500PCI_BUTTON=y
+
+# Enable rt2500usb support
+CONFIG_RT2500USB=y
+
+# Enable rt61pci support
+CONFIG_RT61PCI=y
+# Enable rt61pci hardware button support (requires rfkill)
+CONFIG_RT61PCI_BUTTON=y
+
+# Enable rt73usb support
+CONFIG_RT73USB=y
+
+#
+# CRC-ITU-T support
+#
+
+# Enable crc-itu-t support
+CONFIG_CRC_ITU_T=y
+# Enable crc-itu-t asm file creation
+CONFIG_CRC_ITU_T_ASM=n
+
+#
+# EEPROM 93Cx6 support
+#
+
+# Enable eeprom_93Cx6 support
+CONFIG_EEPROM_93CX6=y
+# Enable eeprom asm file creation
+CONFIG_EEPROM_93CX6_ASM=n
Index: unstable/modules/rt2x00-cvs-suspend2/rt2x00-mac80211.patch
diff -u /dev/null unstable/modules/rt2x00-cvs-suspend2/rt2x00-mac80211.patch:1.1
--- /dev/null	Sun Aug 26 06:46:57 2007
+++ unstable/modules/rt2x00-cvs-suspend2/rt2x00-mac80211.patch	Sun Aug 26 06:46:57 2007
@@ -0,0 +1,65 @@
+diff -Nur rt2x00.orig/rt2400pci.c rt2x00/rt2400pci.c
+--- rt2x00.orig/rt2400pci.c	2007-08-25 16:07:27.000000000 +0200
++++ rt2x00/rt2400pci.c	2007-08-26 12:19:31.000000000 +0200
+@@ -1154,7 +1154,7 @@
+ 	rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+ 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
+ 			   !!(control->flags &
+-			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
++			      0));
+ 	rt2x00_desc_write(txd, 0, word);
+ }
+ 
+diff -Nur rt2x00.orig/rt2500pci.c rt2x00/rt2500pci.c
+--- rt2x00.orig/rt2500pci.c	2007-08-25 16:07:27.000000000 +0200
++++ rt2x00/rt2500pci.c	2007-08-26 12:19:35.000000000 +0200
+@@ -1281,7 +1281,7 @@
+ 	rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+ 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
+ 			   !!(control->flags &
+-			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
++			      0));
+ 	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+ 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
+ 	rt2x00_desc_write(txd, 0, word);
+diff -Nur rt2x00.orig/rt2x00mac.c rt2x00/rt2x00mac.c
+--- rt2x00.orig/rt2x00mac.c	2007-08-25 16:07:27.000000000 +0200
++++ rt2x00/rt2x00mac.c	2007-08-26 12:19:07.000000000 +0200
+@@ -57,11 +57,11 @@
+ 	skb_put(skb, size);
+ 
+ 	if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+-		ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id,
++		ieee80211_ctstoself_get(rt2x00dev->hw,
+ 					frag_skb->data, frag_skb->len, control,
+ 					(struct ieee80211_cts *)(skb->data));
+ 	else
+-		ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id,
++		ieee80211_rts_get(rt2x00dev->hw,
+ 				  frag_skb->data, frag_skb->len, control,
+ 				  (struct ieee80211_rts *)(skb->data));
+ 
+diff -Nur rt2x00.orig/rt61pci.c rt2x00/rt61pci.c
+--- rt2x00.orig/rt61pci.c	2007-08-25 16:07:27.000000000 +0200
++++ rt2x00/rt61pci.c	2007-08-26 12:19:38.000000000 +0200
+@@ -1678,7 +1678,7 @@
+ 	rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+ 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
+ 			   !!(control->flags &
+-			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
++			      0));
+ 	rt2x00_set_field32(&word, TXD_W0_TKIP_MIC, 0);
+ 	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+ 	rt2x00_set_field32(&word, TXD_W0_BURST,
+diff -Nur rt2x00.orig/rt73usb.c rt2x00/rt73usb.c
+--- rt2x00.orig/rt73usb.c	2007-08-25 16:07:28.000000000 +0200
++++ rt2x00/rt73usb.c	2007-08-26 12:19:42.000000000 +0200
+@@ -1314,7 +1314,7 @@
+ 	rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
+ 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
+ 			   !!(control->flags &
+-			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
++			      0));
+ 	rt2x00_set_field32(&word, TXD_W0_TKIP_MIC, 0);
+ 	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+ 	rt2x00_set_field32(&word, TXD_W0_BURST2,




More information about the arch-commits mailing list