diff options
Diffstat (limited to 'package/acx/patches')
| -rw-r--r-- | package/acx/patches/002-disable-usb.diff | 21 | ||||
| -rw-r--r-- | package/acx/patches/003-encrypt-broadcast-traffic.diff | 14 | ||||
| -rw-r--r-- | package/acx/patches/004-add_request_info.patch | 81 | ||||
| -rw-r--r-- | package/acx/patches/005-2.6.30_fixes.patch | 52 | ||||
| -rw-r--r-- | package/acx/patches/006-netdev_ops.patch | 76 | ||||
| -rw-r--r-- | package/acx/patches/007-2.6.33_fixes.patch | 15 |
6 files changed, 0 insertions, 259 deletions
diff --git a/package/acx/patches/002-disable-usb.diff b/package/acx/patches/002-disable-usb.diff deleted file mode 100644 index e3cf098f1..000000000 --- a/package/acx/patches/002-disable-usb.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ KERNELDIR = /lib/modules/$(KVER)/build - obj-m += acx.o - - acx-obj-y += pci.o --acx-obj-y += usb.o -+#acx-obj-y += usb.o - - acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y) - ---- a/acx_config.h -+++ b/acx_config.h -@@ -1,6 +1,6 @@ - /* temporary hack until proper Kconfig integration */ - #define CONFIG_ACX_PCI 1 --#define CONFIG_ACX_USB 1 -+/*#define CONFIG_ACX_USB 1*/ - - #define ACX_RELEASE "v0.3.37" - diff --git a/package/acx/patches/003-encrypt-broadcast-traffic.diff b/package/acx/patches/003-encrypt-broadcast-traffic.diff deleted file mode 100644 index 4743ab7b4..000000000 --- a/package/acx/patches/003-encrypt-broadcast-traffic.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- a/common.c -+++ b/common.c -@@ -4155,6 +4155,11 @@ acx_l_process_data_frame_master(acx_devi - /* To_DS = 0, From_DS = 1 */ - hdr->fc = WF_FC_FROMDSi + WF_FTYPE_DATAi; - -+ /* Do we need to encrypt this? */ -+ if (adev->wep_enabled) { -+ SET_BIT(hdr->fc, WF_FC_ISWEPi); -+ } -+ - txbuf = acx_l_get_txbuf(adev, tx); - if (txbuf) { - len = RXBUF_BYTES_RCVD(adev, rxbuf); diff --git a/package/acx/patches/004-add_request_info.patch b/package/acx/patches/004-add_request_info.patch deleted file mode 100644 index d432870e2..000000000 --- a/package/acx/patches/004-add_request_info.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/ioctl.c -+++ b/ioctl.c -@@ -488,6 +488,7 @@ end_unlock: - /* 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 @@ acx_s_scan_add_station( - 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 @@ acx_s_scan_add_station( - 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 @@ acx_s_scan_add_station( - 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 @@ acx_s_scan_add_station( - 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 @@ acx_s_scan_add_station( - 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 @@ acx_s_scan_add_station( - 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 @@ acx_ioctl_get_scan( - 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; diff --git a/package/acx/patches/005-2.6.30_fixes.patch b/package/acx/patches/005-2.6.30_fixes.patch deleted file mode 100644 index 7503a701f..000000000 --- a/package/acx/patches/005-2.6.30_fixes.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/pci.c -+++ b/pci.c -@@ -2005,7 +2005,12 @@ static void acxpci_s_down(struct net_dev - /* then wait until interrupts have finished executing on other CPUs */ - acx_lock(adev, flags); - disable_acx_irq(adev); -+#ifdef CONFIG_PCI - synchronize_irq(adev->pdev->irq); -+#endif -+#ifdef CONFIG_VLYNQ -+ synchronize_irq(adev->vdev->irq); -+#endif - acx_unlock(adev, flags); - - /* we really don't want to have an asynchronous tasklet disturb us -@@ -4164,7 +4169,11 @@ static __devinit int vlynq_probe(struct - addr = (u32)ioremap(vdev->mem_start, 0x1000); - if (!addr) { - printk(KERN_ERR "%s: failed to remap io memory\n", -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - vdev->dev.bus_id); -+#else -+ dev_name(vdev)); -+#endif - result = -ENXIO; - goto fail; - } -@@ -4231,7 +4240,11 @@ static __devinit int vlynq_probe(struct - - printk("acx: found %s-based wireless network card at %s, irq:%d, " - "phymem:0x%x, mem:0x%p\n", -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - match->name, vdev->dev.bus_id, ndev->irq, -+#else -+ match->name, dev_name(vdev), ndev->irq, -+#endif - vdev->mem_start, adev->iobase); - log(L_ANY, "initial debug setting is 0x%04X\n", acx_debug); - ---- a/wlan_compat.h -+++ b/wlan_compat.h -@@ -221,8 +221,10 @@ - #ifndef IRQ_NONE - #define IRQ_NONE - #define IRQ_HANDLED -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) - typedef void irqreturn_t; - #endif -+#endif - - #ifndef ARPHRD_IEEE80211_PRISM - #define ARPHRD_IEEE80211_PRISM 802 diff --git a/package/acx/patches/006-netdev_ops.patch b/package/acx/patches/006-netdev_ops.patch deleted file mode 100644 index e7840c6eb..000000000 --- a/package/acx/patches/006-netdev_ops.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: acx-20080210/pci.c -=================================================================== ---- acx-20080210.orig/pci.c 2010-05-02 21:37:00.000000000 +0200 -+++ acx-20080210/pci.c 2010-05-02 21:48:22.000000000 +0200 -@@ -1437,6 +1437,18 @@ - - static void dummy_netdev_init(struct net_device *ndev) {} - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) -+static const struct net_device_ops acx_netdev_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, -+}; -+#endif -+ - #ifdef CONFIG_PCI - static int __devinit acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id) - { -@@ -1547,17 +1559,21 @@ - } - - ether_setup(ndev); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) - 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->set_multicast_list = &acxpci_i_set_multicast_list; -+ ndev->tx_timeout = &acxpci_i_tx_timeout; -+ ndev->change_mtu = &acx_e_change_mtu; -+#else -+ ndev->netdev_ops = &acx_netdev_ops; -+#endif - #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); -@@ -4191,17 +4207,24 @@ - goto fail_alloc_netdev; - } - ether_setup(ndev); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - 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->set_multicast_list = &acxpci_i_set_multicast_list; -+ ndev->tx_timeout = &acxpci_i_tx_timeout; -+ ndev->change_mtu = &acx_e_change_mtu; -+ ndev->set_multicast_list = &acxpci_i_set_multicast_list; -+ ndev->tx_timeout = &acxpci_i_tx_timeout; -+ ndev->change_mtu = &acx_e_change_mtu; -+#else -+ ndev->netdev_ops = &acx_netdev_ops; -+#endif - #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; - - adev = ndev2adev(ndev); diff --git a/package/acx/patches/007-2.6.33_fixes.patch b/package/acx/patches/007-2.6.33_fixes.patch deleted file mode 100644 index 338b1c66f..000000000 --- a/package/acx/patches/007-2.6.33_fixes.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/pci.c -+++ b/pci.c -@@ -35,8 +35,12 @@ - - /* Linux 2.6.18+ uses <linux/utsrelease.h> */ - #ifndef UTS_RELEASE -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -+#include <generated/utsrelease.h> -+#else - #include <linux/utsrelease.h> - #endif -+#endif - - #include <linux/compiler.h> /* required for Lx 2.6.8 ?? */ - #include <linux/kernel.h> |