Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2624.git;a=commitdiff;h=7e6ccbbd9e3f677ed289daa1a4777c31ed7ee3d9

commit 7e6ccbbd9e3f677ed289daa1a4777c31ed7ee3d9
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Mon Jan 28 00:06:09 2008 +0100

ipw3945-1.2.2-11-i686
- added patch to compile with kernel-2.6.24

diff --git a/source/network-extra/ipw3945/FrugalBuild 
b/source/network-extra/ipw3945/FrugalBuild
index 49c76b7..14617c0 100644
--- a/source/network-extra/ipw3945/FrugalBuild
+++ b/source/network-extra/ipw3945/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=ipw3945
pkgver=1.2.2
-pkgrel=10
+pkgrel=11
pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux"
_F_sourceforge_ext=".tgz"
Finclude sourceforge kernel-module
@@ -11,7 +11,13 @@ up2date="lynx -dump http://ipw3945.sourceforge.net/|grep 
download$|sed 's/.*-\(.
depends=([EMAIL PROTECTED] 'ipw3945-ucode' 'ipw3945d' 'wireless_tools')
groups=('network-extra')
archs=('i686' 'x86_64')
-sha1sums=('a212551b7d0d6d2266b0a69459db82c20897719f')
+source=($source compile-2.6.24.patch)
+sha1sums=('a212551b7d0d6d2266b0a69459db82c20897719f' \
+          'fa90f77b09fc68b3187a5069bf02ae0c84671789')
+
+# there is an iwl3945 driver in the kernel but we should not remove this
+# package till it's not fully functional (it does not support WPA for example
+# ATM).

build()
{
diff --git a/source/network-extra/ipw3945/compile-2.6.24.patch 
b/source/network-extra/ipw3945/compile-2.6.24.patch
new file mode 100644
index 0000000..f6350fc
--- /dev/null
+++ b/source/network-extra/ipw3945/compile-2.6.24.patch
@@ -0,0 +1,43 @@
+Author: Samuel Tardieu <[EMAIL PROTECTED]>
+Date:   Tue Oct 16 12:31:58 2007 +0200
+
+    MAC_ARG is not defined by the kernel headers anymore
+
+diff --git a/ipw3945.c b/ipw3945.c
+index eec20b7..cc36b9c 100644
+--- a/ipw3945.c
++++ b/ipw3945.c
+@@ -102,6 +102,12 @@
+ #define VQ
+ #endif
+
++/* stolen from net/ieee80211.h */
++#ifndef MAC_ARG
++#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
++                 ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
++#endif
++
+ #define IPW3945_VERSION "1.2.2" VD VM VP VR VQ
+
+ #define DRV_DESCRIPTION       "Intel(R) PRO/Wireless 3945 Network Connection 
driver for Linux"
+
+
+
+Author: Samuel Tardieu <[EMAIL PROTECTED]>
+Date:   Tue Oct 16 12:37:54 2007 +0200
+
+    Nuke SET_MODULE_OWNER() use
+
+diff --git a/ipw3945.c b/ipw3945.c
+index cc36b9c..0369876 100644
+--- a/ipw3945.c
++++ b/ipw3945.c
+@@ -16597,7 +16597,6 @@ static int ipw_pci_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
+               goto out_release_ucode;
+       }
+
+-      SET_MODULE_OWNER(net_dev);
+       SET_NETDEV_DEV(net_dev, &pdev->dev);
+       mutex_lock(&priv->mutex);
+       priv->ieee->hard_start_xmit = ipw_net_hard_start_xmit;
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to