[arch-commits] CVS update of extra/network/ipw3945-ck (3 files)

[Tom Killian]

    Date: Tuesday, July 24, 2007 @ 05:25:09
  Author: tom
    Path: /home/cvs-extra/extra/network/ipw3945-ck

   Added: lockup.patch (1.1)
Modified: PKGBUILD (1.9 -> 1.10) ipw3945.install (1.4 -> 1.5)

upgpkg: ipw3945-ck 1.2.1-2
update for 2.6.22-ck


-----------------+
 PKGBUILD        |   14 ++++++++------
 ipw3945.install |    6 +++---
 lockup.patch    |   31 +++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 9 deletions(-)


Index: extra/network/ipw3945-ck/PKGBUILD
diff -u extra/network/ipw3945-ck/PKGBUILD:1.9 extra/network/ipw3945-ck/PKGBUILD:1.10
--- extra/network/ipw3945-ck/PKGBUILD:1.9	Wed Jun 13 21:14:49 2007
+++ extra/network/ipw3945-ck/PKGBUILD	Tue Jul 24 05:25:08 2007
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD,v 1.9 2007/06/14 01:14:49 james Exp $
+# $Id: PKGBUILD,v 1.10 2007/07/24 09:25:08 tom Exp $
 # Contributor: Giovanni Scafora <linuxmania at gmail.com>
 # Maintainer: James Rayner <iphitus at gmail.com>
-_kernver=2.6.21-ck
+_kernver=2.6.22-ck
 pkgname=ipw3945-ck
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Driver for the Intel PRO/Wireless 3945ABG miniPCI express adapter. For kernel26ck"
 arch=(i686 x86_64)
 url="http://ipw3945.sourceforge.net"
 license=("GPL")
 depends=('wireless_tools' 'kernel26ck' 'ipw3945-ucode' 'ipw3945d')
 install=ipw3945.install
-source=(http://optusnet.dl.sourceforge.net/sourceforge/ipw3945/ipw3945-$pkgver.tgz)
+source=(http://optusnet.dl.sourceforge.net/sourceforge/ipw3945/ipw3945-$pkgver.tgz lockup.patch)
+md5sums=('9d6b2116122beb33a0d1d923ea49065c'
+         'a511372a66b7c9883d597fa00adb13da')
 
 build() {
   cd $startdir/src/ipw3945-$pkgver
@@ -20,9 +22,9 @@
            -e "s:^# \(CONFIG_IEEE80211_RADIOTAP\)=.*:\1=y:" \
            -e "s:^# \(CONFIG_IPW3945_PROMISCUOUS\)=.*:\1=y:" \
            Makefile
-  make  KVER=${_kernver}
+  patch -Np1 -i ../lockup.patch || return 1
+  make  KVER=${_kernver} IEEE80211_INC=/usr/src/linux-${_kernver}/ IEEE80211_IGNORE_DUPLICATE=y
   #Install kernel module
   install -D -m 644 ipw3945.ko  $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless/ipw3945/ipw3945.ko
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
 }
-
Index: extra/network/ipw3945-ck/ipw3945.install
diff -u extra/network/ipw3945-ck/ipw3945.install:1.4 extra/network/ipw3945-ck/ipw3945.install:1.5
--- extra/network/ipw3945-ck/ipw3945.install:1.4	Sun May 27 10:16:08 2007
+++ extra/network/ipw3945-ck/ipw3945.install	Tue Jul 24 05:25:09 2007
@@ -1,7 +1,7 @@
 # arg 1:  the new package version
 post_install()
 {
-  KERNEL_VERSION='2.6.21-ck'
+  KERNEL_VERSION='2.6.22-ck'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1 
   /bin/true
 }
@@ -10,7 +10,7 @@
 # arg 2:  the old package version
 post_upgrade()
 {
-  KERNEL_VERSION='2.6.21-ck'
+  KERNEL_VERSION='2.6.22-ck'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1 
   /bin/true
 }
@@ -24,7 +24,7 @@
 # arg 1:  the old package version
 post_remove()
 {
-  KERNEL_VERSION='2.6.21-ck'
+  KERNEL_VERSION='2.6.22-ck'
   depmod -v $KERNEL_VERSION > /dev/null 2>&1 	 
  
   /bin/true
Index: extra/network/ipw3945-ck/lockup.patch
diff -u /dev/null extra/network/ipw3945-ck/lockup.patch:1.1
--- /dev/null	Tue Jul 24 05:25:09 2007
+++ extra/network/ipw3945-ck/lockup.patch	Tue Jul 24 05:25:09 2007
@@ -0,0 +1,31 @@
+
+Fix potential driver lockup problem
+
+Since we have already store the inta to priv->isr_inta in the
+interrupt handler we don't need to get it from the hardware again
+in the tasklet. Some people find ipw3945-1.2.1 still didn't
+resolve the boot lockup problem as reported in bugzilla #1096.
+
+If you still find the lockup problem in ipw3945-1.2.1, please try
+this patch and report if it resolves your problem or not to
+yi.zhu at intel.com.
+
+Thanks to Egon for providing this patch!
+
+Signed-off-by: Egon <anannatrak at yahoo.it>
+Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+--
+
+--- a/ipw3945.c	2007-04-11 14:46:58.000000000 +0800
++++ b/ipw3945.c	2007-05-14 15:55:56.000000000 +0800
+@@ -2769,8 +2769,8 @@ static void ipw_irq_tasklet(struct ipw_p
+ 
+ 	spin_lock_irqsave(&priv->lock, flags);
+ 
+-	inta = ipw_read32(priv, CSR_INT);
+-	inta_mask = ipw_read32(priv, CSR_INT_MASK);
++	inta = 0;
++	inta_mask = 0;
+ 	ipw_write32(priv, CSR_INT, inta);
+ 	inta &= (CSR_INI_SET_MASK & inta_mask);
+