# ChangeLog for net-wireless/acx
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.16 2010/02/28 17:40:00 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/acx/ChangeLog,v 1.17 2010/03/06 21:40:18 halcy0n Exp $
+
+ 06 Mar 2010; Mark Loeser <halcy0n@gentoo.org>
+ +files/2.6.31+-mepis/01_addRequestInfo.dpatch,
+ -files/2.6.31+-mepis/01_addRequestInfo.dpatch.gz,
+ +files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch,
+ -files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz,
+ +files/2.6.31+-mepis/03_typo_fix.dpatch,
+ -files/2.6.31+-mepis/03_typo_fix.dpatch.gz,
+ +files/2.6.31+-mepis/04_pci_and_usb.dpatch,
+ -files/2.6.31+-mepis/04_pci_and_usb.dpatch.gz:
+ No files should be compressed in the tree
28 Feb 2010; Fabio Erculiani <lxnay@gentoo.org>
acx-0.3.37_p20080210.ebuild, +files/acx-2.6.33.patch:
-AUX 2.6.31+-mepis/01_addRequestInfo.dpatch.gz 1215 RMD160 186546e757bf49a127a5a7d5b217825478e07d41 SHA1 aee4df822b2ea3030654acc32415fdce5e18061c SHA256 520558e5e16383a633442bc6b7e6a30787ff0c22935a01a795f4627ec9f8c519
-AUX 2.6.31+-mepis/02_fix_irqreturn_t.dpatch.gz 493 RMD160 044948450aeb72e76c04a4d053d1195f3b53cbb8 SHA1 bb4e390d22953a16cc816faf0c34c4a33b95f409 SHA256 70b5aef8cbc984cdf2265940e13957b548da99f4b4293b9c4f1999dc77b89d4d
-AUX 2.6.31+-mepis/03_typo_fix.dpatch.gz 587 RMD160 932414724a9bc42f1809aaab57702d19d219000e SHA1 72e0e6d3ea5cb7b6c569bc8ef5ae1356a4ac3200 SHA256 726622cd1537d7efaace496ac0b7c7d82f499cc297c080257dc927c72e088357
-AUX 2.6.31+-mepis/04_pci_and_usb.dpatch.gz 1026 RMD160 7418b806a577e1bf45cb51f11635f2b2beee9531 SHA1 f60346e1282665bab07d36b3603ceb1ebb1c4e6f SHA256 f78d6be2674591c073829f70188d7c2a5e31b575cacec8dc09fcf99af8107db1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.6.31+-mepis/01_addRequestInfo.dpatch 3121 RMD160 8f7bc7373164119a1320ce0d6e1b5df363e5f42c SHA1 8ae3ee8c66940897eebbc31dba1275e93ff14f6c SHA256 210f10074627f0f8b096a87d57062de0416ffb249984797e0d5c971eb989b703
+AUX 2.6.31+-mepis/02_fix_irqreturn_t.dpatch 730 RMD160 6d8aa9b8454893260883182a9a31f63883154f1d SHA1 a495e5d3cd427171720b264f681db01f33548b19 SHA256 4376894d78aef47c7d2460e0e8390d6c2dd333cf2ada76dc18f865c05fd9451c
+AUX 2.6.31+-mepis/03_typo_fix.dpatch 1321 RMD160 6d44031c133183c176c3ddbeecf549d99760078b SHA1 27033be74f0e753169dfbf335a63498b1d2f11b9 SHA256 7f441bc8df71ba480d1a861cda3a588d52292c7811d08c8069216a91d3ef02da
+AUX 2.6.31+-mepis/04_pci_and_usb.dpatch 3089 RMD160 465d74f1c39be610285acd5239b05c6593cca31e SHA1 049f69e7b79b3c0db9b939d6fb31978f855351b6 SHA256 04b388bcd6fa19a8908202d3e23a8cddf4a65318daea6516097a0300a164f167
AUX acx-2.6.33.patch 497 RMD160 789ddbe00c1044cbc7c9efa5baa9faa8ce14fecf SHA1 82c616581d972b769898f7a73cdac3286d415bc4 SHA256 44b534ecc682c5a0bd2be415072386e8050cc5473fb135819294f00521996831
DIST acx-20080210.tar.bz2 148820 RMD160 43d766e1041e06a1290a693858b6777f847e3c62 SHA1 c0489b500722761b6ddbd4cc1c3dbab11ff072d5 SHA256 87a6899ab227899043ad481776ad1b847bb57be417d16b6e72c4f6cf56f7e965
EBUILD acx-0.3.37_p20080210.ebuild 1308 RMD160 3dec2fff6046a32438ddf40419c8435e84b43500 SHA1 a4f939151879ba6d71f6014514936a70ade515e8 SHA256 c9857aeaa77945ca9b8b57e5166a38133474650e8559c74527245ece1f7f9250
-MISC ChangeLog 7080 RMD160 360e995dd36129e93e3b6bf3a981d69644177a71 SHA1 a9085aaffb2d7db7fc84b539f6e0785d6b713213 SHA256 912175f47e2e12402f8a2e8ca5d39e6a4ca3dcff397ea062b38bc979a95cd154
+MISC ChangeLog 7563 RMD160 0d162b0d93d3be375224cd65aec0b0b3b93c69ed SHA1 ad9d32a4a3151c3af3f4bf10a9bf03056958c148 SHA256 892b0b6f070fffb0bd9c04a821edab5139abd0c3d6b89b56f0befab5576ecf8e
MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuSy8YACgkQCRZPokWLroQpMgCfWEymcoXOZnIyQQWcB7ffuStn
+a1wAn0MNuXHjhH4G1BTsjtRYo8dDl0QI
+=/DKQ
+-----END PGP SIGNATURE-----
--- /dev/null
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## addRequestInfo.dpatch by Stefano Canepa <sc@linux.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Let acx100 compile with new kernels
+
+@DPATCH@
+
+--- acx-20080210/ioctl.c 2008-02-10 14:06:42.000000000 -0600
++++ ioctl.c 2008-11-16 02:08:58.000000000 -0600
+@@ -488,6 +488,7 @@
+ /* helper. not sure whether it's really a _s_leeping fn */
+ static char*
+ acx_s_scan_add_station(
++ struct iw_request_info *info,
+ acx_device_t *adev,
+ char *ptr,
+ char *end_buf,
+@@ -503,14 +504,14 @@
+ iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+ MAC_COPY(iwe.u.ap_addr.sa_data, bss->bssid);
+ acxlog_mac(L_IOCTL, "scan, station address: ", bss->bssid, "\n");
+- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_ADDR_LEN);
++ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_ADDR_LEN);
+
+ /* Add ESSID */
+ iwe.cmd = SIOCGIWESSID;
+ iwe.u.data.length = bss->essid_len;
+ iwe.u.data.flags = 1;
+ log(L_IOCTL, "scan, essid: %s\n", bss->essid);
+- ptr = iwe_stream_add_point(ptr, end_buf, &iwe, bss->essid);
++ ptr = iwe_stream_add_point(info, ptr, end_buf, &iwe, bss->essid);
+
+ /* Add mode */
+ iwe.cmd = SIOCGIWMODE;
+@@ -520,7 +521,7 @@
+ else
+ iwe.u.mode = IW_MODE_ADHOC;
+ log(L_IOCTL, "scan, mode: %d\n", iwe.u.mode);
+- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_UINT_LEN);
++ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_UINT_LEN);
+ }
+
+ /* Add frequency */
+@@ -528,7 +529,7 @@
+ iwe.u.freq.m = acx_channel_freq[bss->channel - 1] * 100000;
+ iwe.u.freq.e = 1;
+ log(L_IOCTL, "scan, frequency: %d\n", iwe.u.freq.m);
+- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_FREQ_LEN);
++ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_FREQ_LEN);
+
+ /* Add link quality */
+ iwe.cmd = IWEVQUAL;
+@@ -546,7 +547,7 @@
+ iwe.u.qual.updated = 7;
+ log(L_IOCTL, "scan, link quality: %d/%d/%d\n",
+ iwe.u.qual.level, iwe.u.qual.noise, iwe.u.qual.qual);
+- ptr = iwe_stream_add_event(ptr, end_buf, &iwe, IW_EV_QUAL_LEN);
++ ptr = iwe_stream_add_event(info, ptr, end_buf, &iwe, IW_EV_QUAL_LEN);
+
+ /* Add encryption */
+ iwe.cmd = SIOCGIWENCODE;
+@@ -556,7 +557,7 @@
+ iwe.u.data.flags = IW_ENCODE_DISABLED;
+ iwe.u.data.length = 0;
+ log(L_IOCTL, "scan, encryption flags: %X\n", iwe.u.data.flags);
+- ptr = iwe_stream_add_point(ptr, end_buf, &iwe, bss->essid);
++ ptr = iwe_stream_add_point(info, ptr, end_buf, &iwe, bss->essid);
+
+ /* add rates */
+ iwe.cmd = SIOCGIWRATE;
+@@ -570,7 +571,7 @@
+ if (rate & 1) {
+ iwe.u.bitrate.value = *p * 500000; /* units of 500kb/s */
+ log(L_IOCTL, "scan, rate: %d\n", iwe.u.bitrate.value);
+- ptr_rate = iwe_stream_add_value(ptr, ptr_rate, end_buf,
++ ptr_rate = iwe_stream_add_value(info, ptr, ptr_rate, end_buf,
+ &iwe, IW_EV_PARAM_LEN);
+ }
+ rate >>= 1;
+@@ -625,7 +626,7 @@
+ for (i = 0; i < ARRAY_SIZE(adev->sta_list); i++) {
+ struct client *bss = &adev->sta_list[i];
+ if (!bss->used) continue;
+- ptr = acx_s_scan_add_station(adev, ptr,
++ ptr = acx_s_scan_add_station(info, adev, ptr,
+ extra + IW_SCAN_MAX_DATA, bss);
+ }
+ dwrq->length = ptr - extra;
+
--- /dev/null
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_irqreturn_t.dpatch by Martijn van Brummelen <martijn@brumit.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for compiling the module (Closes: 545367)
+
+@DPATCH@
+diff -urNad acx100-20080210~/wlan_compat.h acx100-20080210/wlan_compat.h
+--- acx100-20080210~/wlan_compat.h 2008-02-10 21:06:42.000000000 +0100
++++ acx100-20080210/wlan_compat.h 2009-11-05 10:07:50.000000000 +0100
+@@ -218,7 +218,7 @@
+ #define WLAN_PACKED __attribute__ ((packed))
+
+ /* Interrupt handler backwards compatibility stuff */
+-#ifndef IRQ_NONE
++#if (! (defined(_LINUX_IRQRETURN_H) || defined(IRQ_NONE)))
+ #define IRQ_NONE
+ #define IRQ_HANDLED
+ typedef void irqreturn_t;
--- /dev/null
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_typo_fix.dpatch by Martijn van Brummelen <martijn@brumit.nl>
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes several small typo's (Closes: 498099)
+
+@DPATCH@
+diff -urNad acx100-20080210~/script/fetch_firmware.sh acx100-20080210/script/fetch_firmware.sh
+--- acx100-20080210~/script/fetch_firmware.sh 2008-02-10 21:06:42.000000000 +0100
++++ acx100-20080210/script/fetch_firmware.sh 2009-11-05 12:46:37.000000000 +0100
+@@ -15,8 +15,8 @@
+ find_driver_dir()
+ {
+ ACXDIR=`pwd`
+- [ -f $ACXDIR/scripts/start_nets.sh ] && return
+- if [ -f $ACXDIR/../scripts/start_net.sh ]; then
++ [ -f $ACXDIR/script/start_net.sh ] && return
++ if [ -f $ACXDIR/../script/start_net.sh ]; then
+ ACXDIR="$ACXDIR/.."
+ return
+ fi
+diff -urNad acx100-20080210~/script/inject_kernel_tree.sh acx100-20080210/script/inject_kernel_tree.sh
+--- acx100-20080210~/script/inject_kernel_tree.sh 2008-02-10 21:06:42.000000000 +0100
++++ acx100-20080210/script/inject_kernel_tree.sh 2009-11-05 12:47:55.000000000 +0100
+@@ -31,7 +31,7 @@
+ }
+
+ print "- Checking acx sources...\n";
+-my $kernel_help = "$from_dir/scripts/kernel_help";
++my $kernel_help = "$from_dir/script/kernel_help";
+ if (!-e "$from_dir/src") {
+ print "*** $from_dir/src doesn't exist!\n";
+ exit 1;
--- /dev/null
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## acx_kernel_update.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Let acx100 compile with 2.6.31 and 2.6.32 kernels
+
+@DPATCH@
+
+--- old_acx-20080210/pci.c 2009-11-09 13:48:14.000000000 +0200
++++ acx-20080210/pci.c 2009-11-09 13:53:34.000000000 +0200
+@@ -1437,6 +1437,17 @@
+
+ static void dummy_netdev_init(struct net_device *ndev) {}
+
++static const struct net_device_ops acx_net_device_ops =
++{
++ .ndo_open = acxpci_e_open,
++ .ndo_stop = acxpci_e_close,
++ .ndo_start_xmit = acx_i_start_xmit,
++ .ndo_get_stats = acx_e_get_stats,
++ .ndo_set_multicast_list = acxpci_i_set_multicast_list,
++ .ndo_tx_timeout = acxpci_i_tx_timeout,
++ .ndo_change_mtu = acx_e_change_mtu,
++};
++
+ #ifdef CONFIG_PCI
+ static int __devinit acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ {
+@@ -1547,17 +1558,11 @@
+ }
+
+ ether_setup(ndev);
+- ndev->open = &acxpci_e_open;
+- ndev->stop = &acxpci_e_close;
+- ndev->hard_start_xmit = &acx_i_start_xmit;
+- ndev->get_stats = &acx_e_get_stats;
++ ndev->netdev_ops = &acx_net_device_ops;
+ #if IW_HANDLER_VERSION <= 5
+ ndev->get_wireless_stats = &acx_e_get_wireless_stats;
+ #endif
+ ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def;
+- ndev->set_multicast_list = &acxpci_i_set_multicast_list;
+- ndev->tx_timeout = &acxpci_i_tx_timeout;
+- ndev->change_mtu = &acx_e_change_mtu;
+ ndev->watchdog_timeo = 4 * HZ;
+ ndev->irq = pdev->irq;
+ ndev->base_addr = pci_resource_start(pdev, 0);
+diff -Naur old_acx-20080210/usb.c acx-20080210/usb.c
+--- old_acx-20080210/usb.c 2009-11-09 13:48:14.000000000 +0200
++++ acx-20080210/usb.c 2009-11-09 13:55:26.000000000 +0200
+@@ -778,6 +778,17 @@
+ static void
+ dummy_netdev_init(struct net_device *ndev) {}
+
++static const struct net_device_ops acx_net_device_ops =
++{
++ .ndo_open = acxusb_e_open,
++ .ndo_stop = acxusb_e_close,
++ .ndo_start_xmit = acx_i_start_xmit,
++ .ndo_get_stats = acx_e_get_stats,
++ .ndo_set_multicast_list = acxusb_i_set_rx_mode,
++ .ndo_tx_timeout = acxusb_i_tx_timeout,
++ .ndo_change_mtu = acx_e_change_mtu,
++};
++
+ static int
+ acxusb_e_probe(struct usb_interface *intf, const struct usb_device_id *devID)
+ {
+@@ -845,20 +856,14 @@
+ /* Register the callbacks for the network device functions */
+
+ ether_setup(ndev);
+- ndev->open = &acxusb_e_open;
+- ndev->stop = &acxusb_e_close;
+- ndev->hard_start_xmit = (void *)&acx_i_start_xmit;
+- ndev->get_stats = (void *)&acx_e_get_stats;
++ ndev->netdev_ops = &acx_net_device_ops;
+ #if IW_HANDLER_VERSION <= 5
+ ndev->get_wireless_stats = (void *)&acx_e_get_wireless_stats;
+ #endif
+ ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def;
+- ndev->set_multicast_list = (void *)&acxusb_i_set_rx_mode;
+ #ifdef HAVE_TX_TIMEOUT
+- ndev->tx_timeout = &acxusb_i_tx_timeout;
+ ndev->watchdog_timeo = 4 * HZ;
+ #endif
+- ndev->change_mtu = &acx_e_change_mtu;
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER)
+ SET_MODULE_OWNER(ndev);
+ #endif
projects / gentoo.git / commitdiff