[arch-commits] CVS update of core/support/wlan-ng26 (PKGBUILD kernel-2.6.24.patch)
Tobias Powalowski
tpowa at archlinux.org
Sun Feb 17 19:01:31 UTC 2008
Date: Sunday, February 17, 2008 @ 14:01:31
Author: tpowa
Path: /home/cvs-core/core/support/wlan-ng26
Modified: PKGBUILD (1.49 -> 1.50) kernel-2.6.24.patch (1.1 -> 1.2)
'upgpkg: fix http://bugs.archlinux.org/task/9546'
---------------------+
PKGBUILD | 8 +--
kernel-2.6.24.patch | 114 ++++++++++++++++++++++++++++++++++++--------------
2 files changed, 87 insertions(+), 35 deletions(-)
Index: core/support/wlan-ng26/PKGBUILD
diff -u core/support/wlan-ng26/PKGBUILD:1.49 core/support/wlan-ng26/PKGBUILD:1.50
--- core/support/wlan-ng26/PKGBUILD:1.49 Sat Jan 26 10:46:38 2008
+++ core/support/wlan-ng26/PKGBUILD Sun Feb 17 14:01:31 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.49 2008/01/26 15:46:38 tpowa Exp $
+# $Id: PKGBUILD,v 1.50 2008/02/17 19:01:31 tpowa Exp $
# Maintainer: Tom Killian <tom at archlinux.org>
pkgname=wlan-ng26
pkgver=0.2.8
-pkgrel=13
+pkgrel=14
_kernver=2.6.24-ARCH
pkgdesc="Wireless Lan usb modules. For kernel26."
arch=(i686 x86_64)
@@ -16,8 +16,7 @@
options=(!makeflags)
md5sums=('5d86ca7bb4ed458743acd922ff09dae6'
'1696441de62db35d9385f15ee2dfb5a7'
- '2dd2b5214ac5c1d9cae66c436a1021fb')
-
+ 'c2cf1f3951e00d616176c19102d245e8')
build() {
cd $startdir/src/linux-wlan-ng-$pkgver
@@ -35,3 +34,4 @@
mv $startdir/pkg/lib/modules/${_kernver}/linux-wlan-ng \
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless
}
+
Index: core/support/wlan-ng26/kernel-2.6.24.patch
diff -u core/support/wlan-ng26/kernel-2.6.24.patch:1.1 core/support/wlan-ng26/kernel-2.6.24.patch:1.2
--- core/support/wlan-ng26/kernel-2.6.24.patch:1.1 Fri Jan 25 12:21:33 2008
+++ core/support/wlan-ng26/kernel-2.6.24.patch Sun Feb 17 14:01:31 2008
@@ -1,43 +1,95 @@
---- src/p80211/p80211netdev.c~ 2007-10-30 14:25:13.000000000 +0100
-+++ src/p80211/p80211netdev.c 2007-10-30 14:31:24.000000000 +0100
-@@ -82,6 +82,7 @@
- #if WIRELESS_EXT > 12
+Index: src/p80211/p80211netdev.c
+===================================================================
+--- src/p80211/p80211netdev.c (revision 1840)
++++ src/p80211/p80211netdev.c (working copy)
+@@ -83,6 +83,11 @@
#include <net/iw_handler.h>
#endif
-+#include <net/net_namespace.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) )
++#include <net/net_namespace.h>
++#define proc_net init_net.proc_net
++#endif
++
/*================================================================*/
/* Project Includes */
-@@ -167,11 +168,11 @@
- DBFENTER;
- #ifdef CONFIG_PROC_FS
-- if (proc_net != NULL) {
-+ if (init_net.proc_net != NULL) {
- proc_p80211 = create_proc_entry(
- "p80211",
- (S_IFDIR|S_IRUGO|S_IXUGO),
-- proc_net);
-+ init_net.proc_net);
- }
- #endif
- DBFEXIT;
-@@ -196,7 +197,7 @@
- DBFENTER;
- #ifdef CONFIG_PROC_FS
- if (proc_p80211 != NULL) {
-- remove_proc_entry("p80211", proc_net);
-+ remove_proc_entry("p80211", init_net.proc_net);
- }
- #endif
- DBFEXIT;
---- src/prism2/driver/prism2_usb.c~ 2007-03-19 16:37:00.000000000 +0100
-+++ src/prism2/driver/prism2_usb.c 2007-10-30 14:36:48.000000000 +0100
-@@ -131,7 +131,6 @@
+@@ -938,7 +943,11 @@
+ dev->wireless_handlers = &p80211wext_handler_def;
+ #endif
+ #endif
+-
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) )
++ dev->nd_net = &init_net;
++#endif
++
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,38) )
+ dev->tbusy = 1;
+ dev->start = 0;
+Index: src/prism2/driver/prism2_plx.c
+===================================================================
+--- src/prism2/driver/prism2_plx.c (revision 1840)
++++ src/prism2/driver/prism2_plx.c (working copy)
+@@ -228,7 +228,9 @@
+ /* Register the wlandev, this gets us a name and registers the
+ * linux netdevice.
+ */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ SET_MODULE_OWNER(wlandev->netdev);
++#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+ SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev));
+ #endif
+Index: src/prism2/driver/prism2_cs.c
+===================================================================
+--- src/prism2/driver/prism2_cs.c (revision 1840)
++++ src/prism2/driver/prism2_cs.c (working copy)
+@@ -517,7 +517,9 @@
+ #endif
+
+ /* Register the network device and get assigned a name */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ SET_MODULE_OWNER(wlandev->netdev);
++#endif
+ SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(pdev));
+ if (register_wlandev(wlandev) != 0) {
+ WLAN_LOG_NOTICE("prism2sta_cs: register_wlandev() failed.\n");
+@@ -1080,7 +1082,9 @@
+ link->dev = &hw->node;
+
+ /* Register the network device and get assigned a name */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ SET_MODULE_OWNER(wlandev->netdev);
++#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) )
+ SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(link->handle));
+ #endif
+Index: src/prism2/driver/prism2_usb.c
+===================================================================
+--- src/prism2/driver/prism2_usb.c (revision 1840)
++++ src/prism2/driver/prism2_usb.c (working copy)
+@@ -132,7 +132,9 @@
/* Register the wlandev, this gets us a name and registers the
* linux netdevice.
*/
-- SET_MODULE_OWNER(wlandev->netdev);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ SET_MODULE_OWNER(wlandev->netdev);
++#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
#endif
+Index: src/prism2/driver/prism2_pci.c
+===================================================================
+--- src/prism2/driver/prism2_pci.c (revision 1840)
++++ src/prism2/driver/prism2_pci.c (working copy)
+@@ -119,7 +119,9 @@
+ /* Register the wlandev, this gets us a name and registers the
+ * linux netdevice.
+ */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
+ SET_MODULE_OWNER(wlandev->netdev);
++#endif
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+ SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev));
+ #endif
More information about the arch-commits
mailing list