package/acx/patches/006-netdev_ops.patch

   1 Index: acx-20080210/pci.c
   2 ===================================================================
   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
   5 @@ -4135,6 +4135,18 @@
   6         { 0, 0, 0 },
   7  };
   8
   9 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  10 +static const struct net_device_ops acx_netdev_ops = {
  11 +       .ndo_open               = &acxpci_e_open,
  12 +       .ndo_stop               = &acxpci_e_close,
  13 +       .ndo_start_xmit         = &acx_i_start_xmit,
  14 +       .ndo_get_stats          = &acx_e_get_stats,
  15 +       .ndo_set_multicast_list = &acxpci_i_set_multicast_list,
  16 +       .ndo_tx_timeout         = &acxpci_i_tx_timeout,
  17 +       .ndo_change_mtu         = &acx_e_change_mtu,
  18 +};
  19 +#endif
  20 +
  21  static __devinit int vlynq_probe(struct vlynq_device *vdev,
  22                                 struct vlynq_device_id *id)
  23  {
  24 @@ -4191,17 +4203,24 @@
  25                 goto fail_alloc_netdev;
  26         }
  27         ether_setup(ndev);
  28 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
  29         ndev->open = &acxpci_e_open;
  30         ndev->stop = &acxpci_e_close;
  31         ndev->hard_start_xmit = &acx_i_start_xmit;
  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;
  39 +#else
  40 +       ndev->netdev_ops = &acx_netdev_ops;
  41 +#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;
  49         ndev->watchdog_timeo = 4 * HZ;
  50
  51         adev = ndev2adev(ndev);