hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ar7] move netdev_ops conversion, previous hunk was not correct 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20016 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Florian Fainelli 2010-03-06 12:48:13 +00:00
parent 1e0ccaa871
commit 93cdb999f4
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/acx/patches/006-netdev_ops.patch
View File

@ -1,7 +1,7 @@
Index: acx-20080210/pci.c Index: acx-20080210/pci.c
=================================================================== ===================================================================
--- acx-20080210.orig/pci.c 2010-03-06 11:38:01.000000000 +0100 --- acx-20080210.orig/pci.c 2010-03-06 13:43:06.000000000 +0100
+++ acx-20080210/pci.c 2010-03-06 11:45:02.000000000 +0100 +++ acx-20080210/pci.c 2010-03-06 13:46:38.000000000 +0100
@@ -4135,6 +4135,18 @@ @@ -4135,6 +4135,18 @@
{ 0, 0, 0 }, { 0, 0, 0 },
}; };
@ -21,7 +21,7 @@ Index: acx-20080210/pci.c
static __devinit int vlynq_probe(struct vlynq_device *vdev, static __devinit int vlynq_probe(struct vlynq_device *vdev,
struct vlynq_device_id *id) struct vlynq_device_id *id)
{ {
@@ -4191,6 +4203,7 @@ @@ -4191,17 +4203,24 @@
goto fail_alloc_netdev; goto fail_alloc_netdev;
} }
ether_setup(ndev); ether_setup(ndev);
@ -29,13 +29,23 @@ Index: acx-20080210/pci.c
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;
@@ -4202,6 +4215,9 @@ ndev->get_stats = &acx_e_get_stats;
ndev->set_multicast_list = &acxpci_i_set_multicast_list; + ndev->set_multicast_list = &acxpci_i_set_multicast_list;
ndev->tx_timeout = &acxpci_i_tx_timeout; + ndev->tx_timeout = &acxpci_i_tx_timeout;
ndev->change_mtu = &acx_e_change_mtu; + 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 +#else
+ ndev->netdev_ops = &acx_netdev_ops; + ndev->netdev_ops = &acx_netdev_ops;
+#endif +#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->watchdog_timeo = 4 * HZ;
adev = ndev2adev(ndev); adev = ndev2adev(ndev);