KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make acx available to PCI platforms as well (#7174)

Browse source 
SVN-Revision: 21313
This commit is contained in:
Florian Fainelli 2010-05-02 19:51:56 +00:00
parent 262640cb9e
commit 6f7314977b
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/acx/Makefile
View file

@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/acx define KernelPackage/acx
TITLE:=Driver for TI ACX1xx chipset TITLE:=Driver for TI ACX1xx chipset
DEPENDS:=@LINUX_2_6 @TARGET_ar7 +wireless-tools DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||TARGET_ar7 +wireless-tools
URL:=http://acx100.sourceforge.net/ URL:=http://acx100.sourceforge.net/
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX) FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)

47
package/acx/patches/006-netdev_ops.patch
View file

@ -1,10 +1,12 @@
--- a/pci.c Index: acx-20080210/pci.c
+++ b/pci.c ===================================================================
@@ -4135,6 +4135,18 @@ static struct vlynq_device_id acx_vlynq_ --- acx-20080210.orig/pci.c 2010-05-02 21:37:00.000000000 +0200
{ 0, 0, 0 }, +++ acx-20080210/pci.c 2010-05-02 21:48:22.000000000 +0200
}; @@ -1437,6 +1437,18 @@
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) 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 = { +static const struct net_device_ops acx_netdev_ops = {
+ .ndo_open = &acxpci_e_open, + .ndo_open = &acxpci_e_open,
+ .ndo_stop = &acxpci_e_close, + .ndo_stop = &acxpci_e_close,
@ -16,14 +18,39 @@
+}; +};
+#endif +#endif
+ +
static __devinit int vlynq_probe(struct vlynq_device *vdev, #ifdef CONFIG_PCI
struct vlynq_device_id *id) static int __devinit acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
@@ -4191,17 +4203,24 @@ static __devinit int vlynq_probe(struct @@ -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; goto fail_alloc_netdev;
} }
ether_setup(ndev); ether_setup(ndev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
ndev->open = &acxpci_e_open; ndev->open = &acxpci_e_open;
ndev->stop = &acxpci_e_close; ndev->stop = &acxpci_e_close;
ndev->hard_start_xmit = &acx_i_start_xmit; ndev->hard_start_xmit = &acx_i_start_xmit;