tiacx-lts/kernel-2.6.31.patch

   1 --- acx-20080210/pci.c  2008-02-10 21:06:42.000000000 +0100
   2 +++ acx-20080210/pci.c  2009-09-11 22:27:28.000000000 +0200
   3 @@ -1437,6 +1437,19 @@
   4
   5  static void dummy_netdev_init(struct net_device *ndev) {}
   6
   7 +static const struct net_device_ops acx_netdev_ops = {
   8 +       .ndo_open = &acxpci_e_open,
   9 +       .ndo_stop = &acxpci_e_close,
  10 +       .ndo_start_xmit = &acx_i_start_xmit,
  11 +       .ndo_get_stats = &acx_e_get_stats,
  12 +#if IW_HANDLER_VERSION <= 5
  13 +       .ndo_get_wireless_stats = &acx_e_get_wireless_stats,
  14 +#endif
  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 +
  20  #ifdef CONFIG_PCI
  21  static int __devinit acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  22  {
  23 @@ -1547,17 +1560,8 @@
  24         }
  25
  26         ether_setup(ndev);
  27 -       ndev->open = &acxpci_e_open;
  28 -       ndev->stop = &acxpci_e_close;
  29 -       ndev->hard_start_xmit = &acx_i_start_xmit;
  30 -       ndev->get_stats = &acx_e_get_stats;
  31 -#if IW_HANDLER_VERSION <= 5
  32 -       ndev->get_wireless_stats = &acx_e_get_wireless_stats;
  33 -#endif
  34 -       ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def;
  35 -       ndev->set_multicast_list = &acxpci_i_set_multicast_list;
  36 -       ndev->tx_timeout = &acxpci_i_tx_timeout;
  37 -       ndev->change_mtu = &acx_e_change_mtu;
  38 +       ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def;
  39 +       ndev->netdev_ops = &acx_netdev_ops;
  40         ndev->watchdog_timeo = 4 * HZ;
  41         ndev->irq = pdev->irq;
  42         ndev->base_addr = pci_resource_start(pdev, 0);
  43 --- acx-20080210/usb.c  2008-02-10 21:06:42.000000000 +0100
  44 +++ acx-20080210/usb.c  2009-09-11 22:38:42.000000000 +0200
  45 @@ -778,6 +778,21 @@
  46  static void
  47  dummy_netdev_init(struct net_device *ndev) {}
  48
  49 +static const struct net_device_ops acxusb_netdev_ops = {
  50 +       .ndo_open = &acxusb_e_open,
  51 +       .ndo_stop = &acxusb_e_close,
  52 +       .ndo_start_xmit = (void *)&acx_i_start_xmit,
  53 +       .ndo_get_stats = (void *)&acx_e_get_stats,
  54 +#if IW_HANDLER_VERSION <= 5
  55 +       .ndo_get_wireless_stats = (void *)&acx_e_get_wireless_stats,
  56 +#endif
  57 +       .ndo_set_multicast_list = (void *)&acxusb_i_set_rx_mode,
  58 +#ifdef HAVE_TX_TIMEOUT
  59 +       .ndo_tx_timeout = &acxusb_i_tx_timeout,
  60 +#endif
  61 +       .ndo_change_mtu = &acx_e_change_mtu,
  62 +};
  63 +
  64  static int
  65  acxusb_e_probe(struct usb_interface *intf, const struct usb_device_id *devID)
  66  {
  67 @@ -845,20 +860,11 @@
  68         /* Register the callbacks for the network device functions */
  69
  70         ether_setup(ndev);
  71 -       ndev->open = &acxusb_e_open;
  72 -       ndev->stop = &acxusb_e_close;
  73 -       ndev->hard_start_xmit = (void *)&acx_i_start_xmit;
  74 -       ndev->get_stats = (void *)&acx_e_get_stats;
  75 -#if IW_HANDLER_VERSION <= 5
  76 -       ndev->get_wireless_stats = (void *)&acx_e_get_wireless_stats;
  77 -#endif
  78         ndev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def;
  79 -       ndev->set_multicast_list = (void *)&acxusb_i_set_rx_mode;
  80 +       ndev->netdev_ops = &acxusb_netdev_ops;
  81  #ifdef HAVE_TX_TIMEOUT
  82 -       ndev->tx_timeout = &acxusb_i_tx_timeout;
  83         ndev->watchdog_timeo = 4 * HZ;
  84  #endif
  85 -       ndev->change_mtu = &acx_e_change_mtu;
  86  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) && defined(SET_MODULE_OWNER)
  87         SET_MODULE_OWNER(ndev);
  88  #endif