[arch-commits] Commit in wlan-ng26/trunk (5 files)
Tobias Powalowski
tpowa at archlinux.org
Tue Aug 5 10:33:49 UTC 2008
Date: Tuesday, August 5, 2008 @ 06:33:48
Author: tpowa
Revision: 7952
upgpkg: wlan-ng26 0.2.9-1
Added:
wlan-ng26/trunk/kernel-2.6.26.patch
Modified:
wlan-ng26/trunk/PKGBUILD
wlan-ng26/trunk/wlan-ng26.install
Deleted:
wlan-ng26/trunk/kernel-2.6.22-r1832.patch
wlan-ng26/trunk/kernel-2.6.24.patch
---------------------------+
PKGBUILD | 18 ++----
kernel-2.6.22-r1832.patch | 120 --------------------------------------------
kernel-2.6.24.patch | 95 ----------------------------------
kernel-2.6.26.patch | 14 +++++
wlan-ng26.install | 4 -
5 files changed, 24 insertions(+), 227 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-08-05 10:28:39 UTC (rev 7951)
+++ PKGBUILD 2008-08-05 10:33:48 UTC (rev 7952)
@@ -2,26 +2,22 @@
# Maintainer: Tom Killian <tom at archlinux.org>
pkgname=wlan-ng26
-pkgver=0.2.8
-pkgrel=17
-_kernver=2.6.25-ARCH
+pkgver=0.2.9
+pkgrel=1
+_kernver=2.6.26-ARCH
pkgdesc="Wireless Lan usb modules. For kernel26."
arch=(i686 x86_64)
license=('MPL')
-depends=('kernel26>=2.6.25.3-1' 'kernel26<2.6.26' 'wlan-ng26-utils')
+depends=('kernel26>=2.6.26-1' 'kernel26<2.6.27' 'wlan-ng26-utils')
source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-$pkgver.tar.bz2
- kernel-2.6.22-r1832.patch kernel-2.6.24.patch)
+ kernel-2.6.26.patch)
url="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/"
install=wlan-ng26.install
options=(!makeflags)
-md5sums=('5d86ca7bb4ed458743acd922ff09dae6'
- '1696441de62db35d9385f15ee2dfb5a7'
- 'c2cf1f3951e00d616176c19102d245e8')
build() {
cd $startdir/src/linux-wlan-ng-$pkgver
- patch -Np1 -i ../kernel-2.6.22-r1832.patch || return 1
- patch -Np0 -i ../kernel-2.6.24.patch || return 1
+ patch -Np0 -i ../kernel-2.6.26.patch || return 1
# only built usb modules the rest is covered by hostap and orinoco driver, according to gentoo changelog
sed -i "s#PRISM2_PCMCIA=y#PRISM2_PCMCIA=n#;s#TARGET_ROOT_ON_HOST=#TARGET_ROOT_ON_HOST=$startdir/pkg#;s#PRISM2_PLX=y#PRISM2_PLX=n#;s#PRISM2_PCI=y#PRISM2_PCI=n#;s#PRISM2_USB=n#PRISM2_USB=y#;s%#LINUX_SRC=/usr/src/linux%LINUX_SRC=/lib/modules/${_kernver}/build%" config.in
make auto_config
@@ -35,3 +31,5 @@
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless
}
+md5sums=('96130b36f9674521b08fb3e2a6ac0382'
+ '6ed5a5fefc2c149e0e0a98de211ba147')
Deleted: kernel-2.6.22-r1832.patch
===================================================================
--- kernel-2.6.22-r1832.patch 2008-08-05 10:28:39 UTC (rev 7951)
+++ kernel-2.6.22-r1832.patch 2008-08-05 10:33:48 UTC (rev 7952)
@@ -1,120 +0,0 @@
-diff -uNr linux-wlan-ng-0.2.8/CHANGES linux-wlan-ng-svn-1832/CHANGES
---- linux-wlan-ng-0.2.8/CHANGES 2007-05-04 13:29:27.000000000 +0100
-+++ linux-wlan-ng-svn-1832/CHANGES 2007-06-27 11:28:14.000000000 +0100
-@@ -41,6 +41,8 @@
- * Intersil Corporation as part of PRISM(R) chipset product development.
- *
- * --------------------------------------------------------------------
-+ - Tweaks to support Fedora 7 (Dan Williams)
-+ - Support 2.6.22 kernels
- 0.2.8
- - Fix up a pile of sparse warnings (Pavel Roskin)
- - Support 2.6.20 kernels (Pavel Roskin)
-diff -uNr linux-wlan-ng-0.2.8/Configure linux-wlan-ng-svn-1832/Configure
---- linux-wlan-ng-0.2.8/Configure 2007-05-07 23:00:22.000000000 +0100
-+++ linux-wlan-ng-svn-1832/Configure 2007-06-27 11:28:14.000000000 +0100
-@@ -277,9 +277,9 @@
- fi
- write_bool KERN_2_6_17
-
--if [ $VERSION_CODE -gt `version 2 6 21` ] ; then
-+if [ $VERSION_CODE -gt `version 2 6 22` ] ; then
- $ECHO "******* WARNING WARNING WARNING *******"
-- $ECHO "Kernels newer than 2.6.21.x are not supported."
-+ $ECHO "Kernels newer than 2.6.22.x are not supported."
- $ECHO "******* WARNING WARNING WARNING *******"
- fi
-
-diff -uNr linux-wlan-ng-0.2.8/config.in linux-wlan-ng-svn-1832/config.in
---- linux-wlan-ng-0.2.8/config.in 2007-02-09 21:51:58.000000000 +0000
-+++ linux-wlan-ng-svn-1832/config.in 2007-06-27 11:28:14.000000000 +0100
-@@ -1,6 +1,6 @@
- WLAN_VERSION=0
- WLAN_PATCHLEVEL=2
--WLAN_SUBLEVEL=8
-+WLAN_SUBLEVEL=9
- WLAN_EXTRAVERSION=
- #LINUX_SRC=/usr/src/linux
- PCMCIA_SRC=
-diff -uNr linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules linux-wlan-ng-svn-1832/etc/udev/rules.d/40-prism2.rules
---- linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules 2006-06-26 16:03:27.000000000 +0100
-+++ linux-wlan-ng-svn-1832/etc/udev/rules.d/40-prism2.rules 2007-06-27 11:28:14.000000000 +0100
-@@ -1 +1,2 @@
--ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k"
-+#ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k"
-+KERNEL="wlan*",ACTION=="add",DRIVERS=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k"
-diff -uNr linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h linux-wlan-ng-svn-1832/src/include/wlan/wlan_compat.h
---- linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h 2007-02-28 15:44:02.000000000 +0000
-+++ linux-wlan-ng-svn-1832/src/include/wlan/wlan_compat.h 2007-06-27 11:28:14.000000000 +0100
-@@ -479,6 +479,13 @@
- #endif
- #endif /* _LINUX_PROC_FS_H */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-+#define skb_reset_mac_header(__a) (__a)->mac.raw = (__a)->data
-+#define SKB_MAC_HEADER(__a) (__a)->mac.raw
-+#else
-+#define SKB_MAC_HEADER(__a) (__a)->mac_header
-+#endif
-+
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
- #ifndef INIT_TQUEUE
- #define PREPARE_TQUEUE(_tq, _routine, _data) \
-diff -uNr linux-wlan-ng-0.2.8/src/p80211/p80211conv.c linux-wlan-ng-svn-1832/src/p80211/p80211conv.c
---- linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-03-19 15:37:00.000000000 +0000
-+++ linux-wlan-ng-svn-1832/src/p80211/p80211conv.c 2007-06-27 11:28:14.000000000 +0100
-@@ -498,7 +498,7 @@
- }
-
- skb->protocol = eth_type_trans(skb, netdev);
-- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */
-+ SKB_MAC_HEADER(skb) = (unsigned char *) e_hdr; /* new MAC header */
-
- /* jkriegl: process signal and noise as set in hfa384x_int_rx() */
- /* jkriegl: only process signal/noise if requested by iwspy */
-diff -uNr linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c linux-wlan-ng-svn-1832/src/p80211/p80211netdev.c
---- linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-03-19 15:37:00.000000000 +0000
-+++ linux-wlan-ng-svn-1832/src/p80211/p80211netdev.c 2007-06-27 11:28:14.000000000 +0100
-@@ -389,7 +389,8 @@
-
- /* set up various data fields */
- skb->dev = dev;
-- skb->mac.raw = skb->data ;
-+ skb_reset_mac_header(skb);
-+
- skb->ip_summed = CHECKSUM_NONE;
- skb->pkt_type = PACKET_OTHERHOST;
- skb->protocol = htons(ETH_P_80211_RAW);
-@@ -929,7 +930,7 @@
- dev->open = p80211knetdev_open;
- dev->stop = p80211knetdev_stop;
-
--#ifdef CONFIG_NET_WIRELESS
-+#if defined(CONFIG_NET_WIRELESS) || defined(WIRELESS_EXT)
- #if ((WIRELESS_EXT < 17) && (WIRELESS_EXT < 21))
- dev->get_wireless_stats = p80211wext_get_wireless_stats;
- #endif
-diff -uNr linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x.c
---- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-03-19 15:37:00.000000000 +0000
-+++ linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x.c 2007-06-27 11:28:14.000000000 +0100
-@@ -3645,7 +3645,7 @@
- /* the prism2 cards don't return the FCS */
- datap = skb_put(skb, WLAN_CRC_LEN);
- memset (datap, 0xff, WLAN_CRC_LEN);
-- skb->mac.raw = skb->data;
-+ skb_reset_mac_header(skb);
-
- /* Attach the rxmeta, set some stuff */
- p80211skb_rxmeta_attach(wlandev, skb);
-diff -uNr linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x_usb.c
---- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-03-19 15:37:00.000000000 +0000
-+++ linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x_usb.c 2007-06-27 11:28:14.000000000 +0100
-@@ -4255,7 +4255,7 @@
- /* The prism2 series does not return the CRC */
- memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN);
-
-- skb->mac.raw = skb->data;
-+ skb_reset_mac_header(skb);
-
- /* Attach the rxmeta, set some stuff */
- p80211skb_rxmeta_attach(wlandev, skb);
Deleted: kernel-2.6.24.patch
===================================================================
--- kernel-2.6.24.patch 2008-08-05 10:28:39 UTC (rev 7951)
+++ kernel-2.6.24.patch 2008-08-05 10:33:48 UTC (rev 7952)
@@ -1,95 +0,0 @@
-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
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) )
-+#include <net/net_namespace.h>
-+#define proc_net init_net.proc_net
-+#endif
-+
- /*================================================================*/
- /* Project Includes */
-
-@@ -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.
- */
-+#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
Added: kernel-2.6.26.patch
===================================================================
--- kernel-2.6.26.patch (rev 0)
+++ kernel-2.6.26.patch 2008-08-05 10:33:48 UTC (rev 7952)
@@ -0,0 +1,14 @@
+Index: src/p80211/p80211netdev.c
+===================================================================
+--- src/p80211/p80211netdev.c (revision 1865)
++++ src/p80211/p80211netdev.c (working copy)
+@@ -947,7 +947,9 @@
+ #endif
+ #endif
+
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) )
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) )
++ dev_net_set(dev, &init_net);
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) )
+ dev->nd_net = &init_net;
+ #endif
\ No newline at end of file
Modified: wlan-ng26.install
===================================================================
--- wlan-ng26.install 2008-08-05 10:28:39 UTC (rev 7951)
+++ wlan-ng26.install 2008-08-05 10:33:48 UTC (rev 7952)
@@ -8,7 +8,7 @@
post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.25-ARCH
+ KERNEL_VERSION=2.6.26-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
@@ -21,7 +21,7 @@
post_remove() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.25-ARCH
+ KERNEL_VERSION=2.6.26-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
More information about the arch-commits
mailing list