Changeset 20016


Ignore:
Timestamp:
2010-03-06T13:48:13+01:00 (6 years ago)
Author:
florian
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/acx/patches/006-netdev_ops.patch

    r20014 r20016  
    11Index: acx-20080210/pci.c 
    22=================================================================== 
    3 --- acx-20080210.orig/pci.c     2010-03-06 11:38:01.000000000 +0100 
    4 +++ acx-20080210/pci.c  2010-03-06 11:45:02.000000000 +0100 
     3--- acx-20080210.orig/pci.c     2010-03-06 13:43:06.000000000 +0100 
     4+++ acx-20080210/pci.c  2010-03-06 13:46:38.000000000 +0100 
    55@@ -4135,6 +4135,18 @@ 
    66        { 0, 0, 0 }, 
     
    2222                                struct vlynq_device_id *id) 
    2323 { 
    24 @@ -4191,6 +4203,7 @@ 
     24@@ -4191,17 +4203,24 @@ 
    2525                goto fail_alloc_netdev; 
    2626        } 
     
    3030        ndev->stop = &acxpci_e_close; 
    3131        ndev->hard_start_xmit = &acx_i_start_xmit; 
    32 @@ -4202,6 +4215,9 @@ 
    33         ndev->set_multicast_list = &acxpci_i_set_multicast_list; 
    34         ndev->tx_timeout = &acxpci_i_tx_timeout; 
    35         ndev->change_mtu = &acx_e_change_mtu; 
     32        ndev->get_stats = &acx_e_get_stats; 
     33+       ndev->set_multicast_list = &acxpci_i_set_multicast_list; 
     34+       ndev->tx_timeout = &acxpci_i_tx_timeout; 
     35+       ndev->change_mtu = &acx_e_change_mtu; 
     36+       ndev->set_multicast_list = &acxpci_i_set_multicast_list; 
     37+       ndev->tx_timeout = &acxpci_i_tx_timeout; 
     38+       ndev->change_mtu = &acx_e_change_mtu; 
    3639+#else 
    3740+       ndev->netdev_ops = &acx_netdev_ops; 
    3841+#endif 
     42 #if IW_HANDLER_VERSION <= 5 
     43        ndev->get_wireless_stats = &acx_e_get_wireless_stats; 
     44 #endif 
     45        ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def; 
     46-       ndev->set_multicast_list = &acxpci_i_set_multicast_list; 
     47-       ndev->tx_timeout = &acxpci_i_tx_timeout; 
     48-       ndev->change_mtu = &acx_e_change_mtu; 
    3949        ndev->watchdog_timeo = 4 * HZ; 
    4050  
Note: See TracChangeset for help on using the changeset viewer.