* [gentoo-commits] gentoo-x86 commit in net-wireless/acx/files/2.6.31+-mepis: 03_typo_fix.dpatch 04_pci_and_usb.dpatch 02_fix_irqreturn_t.dpatch 01_addRequestInfo.dpatch 01_addRequestInfo.dpatch.gz 02_fix_irqreturn_t.dpatch.gz 04_pci_and_usb.dpatch.gz 03_typo_fix.dpatch.gz
@ 2010-03-06 21:40 Mark Loeser (halcy0n)
0 siblings, 0 replies; only message in thread
From: Mark Loeser (halcy0n) @ 2010-03-06 21:40 UTC (permalink / raw
To: gentoo-commits
halcy0n 10/03/06 21:40:18
Added: 03_typo_fix.dpatch 04_pci_and_usb.dpatch
02_fix_irqreturn_t.dpatch 01_addRequestInfo.dpatch
Removed: 01_addRequestInfo.dpatch.gz
02_fix_irqreturn_t.dpatch.gz
04_pci_and_usb.dpatch.gz 03_typo_fix.dpatch.gz
Log:
No files should be compressed in the tree
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Revision Changes Path
1.1 net-wireless/acx/files/2.6.31+-mepis/03_typo_fix.dpatch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/03_typo_fix.dpatch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/03_typo_fix.dpatch?rev=1.1&content-type=text/plain
Index: 03_typo_fix.dpatch
===================================================================
#! /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;
1.1 net-wireless/acx/files/2.6.31+-mepis/04_pci_and_usb.dpatch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/04_pci_and_usb.dpatch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/04_pci_and_usb.dpatch?rev=1.1&content-type=text/plain
Index: 04_pci_and_usb.dpatch
===================================================================
#! /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
1.1 net-wireless/acx/files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/02_fix_irqreturn_t.dpatch?rev=1.1&content-type=text/plain
Index: 02_fix_irqreturn_t.dpatch
===================================================================
#! /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;
1.1 net-wireless/acx/files/2.6.31+-mepis/01_addRequestInfo.dpatch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/01_addRequestInfo.dpatch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/acx/files/2.6.31+-mepis/01_addRequestInfo.dpatch?rev=1.1&content-type=text/plain
Index: 01_addRequestInfo.dpatch
===================================================================
#! /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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-06 21:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-06 21:40 [gentoo-commits] gentoo-x86 commit in net-wireless/acx/files/2.6.31+-mepis: 03_typo_fix.dpatch 04_pci_and_usb.dpatch 02_fix_irqreturn_t.dpatch 01_addRequestInfo.dpatch 01_addRequestInfo.dpatch.gz 02_fix_irqreturn_t.dpatch.gz 04_pci_and_usb.dpatch.gz 03_typo_fix.dpatch.gz Mark Loeser (halcy0n)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox