src/patches/suse-2.6.27.39/patches.drivers/staging-rtl8192e-backport-net_device_ops-conversion.patch

   1 From foo@baz Wed Aug 12 09:28:09 PDT 2009
   2 Date: Wed, 12 Aug 2009 09:28:09 -0700
   3 To: Greg KH <greg@kroah.com>
   4 From: Greg Kroah-Hartman <gregkh@suse.de>
   5 Subject: Staging: rtl8192e: backport net_device_ops conversion
   6
   7 2.6.27 does not have struct net_device_ops, so backport the changes
   8 needed to get things to work here.
   9
  10 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11 ---
  12  drivers/staging/rtl8192e/ieee80211/ieee80211_module.c |    2 --
  13  drivers/staging/rtl8192e/r8192E_core.c                |    6 ++++--
  14  2 files changed, 4 insertions(+), 4 deletions(-)
  15
  16 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
  17 +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
  18 @@ -118,9 +118,7 @@ struct net_device *alloc_ieee80211(int s
  19  #else
  20         ieee = (struct ieee80211_device *)dev->priv;
  21  #endif
  22 -#if 0
  23         dev->hard_start_xmit = ieee80211_xmit;
  24 -#endif
  25
  26         memset(ieee, 0, sizeof(struct ieee80211_device)+sizeof_priv);
  27         ieee->dev = dev;
  28 --- a/drivers/staging/rtl8192e/r8192E_core.c
  29 +++ b/drivers/staging/rtl8192e/r8192E_core.c
  30 @@ -6231,6 +6231,7 @@ void rtl8192_irq_rx_tasklet(struct r8192
  31         write_nic_dword(priv->ieee80211->dev, INTA_MASK,read_nic_dword(priv->ieee80211->dev, INTA_MASK) | IMR_RDU);
  32  }
  33
  34 +#if 0
  35  static const struct net_device_ops rtl8192_netdev_ops = {
  36         .ndo_open =                     rtl8192_open,
  37         .ndo_stop =                     rtl8192_close,
  38 @@ -6241,6 +6242,7 @@ static const struct net_device_ops rtl81
  39         .ndo_set_mac_address =          r8192_set_mac_adr,
  40         .ndo_start_xmit =               ieee80211_xmit,
  41  };
  42 +#endif
  43
  44  /****************************************************************************
  45       ---------------------------- PCI_STUFF---------------------------
  46 @@ -6362,8 +6364,9 @@ static int __devinit rtl8192_pci_probe(s
  47         dev->irq = pdev->irq;
  48         priv->irq = 0;
  49
  50 -       dev->netdev_ops = &rtl8192_netdev_ops;
  51  #if 0
  52 +       dev->netdev_ops = &rtl8192_netdev_ops;
  53 +#endif
  54         dev->open = rtl8192_open;
  55         dev->stop = rtl8192_close;
  56         //dev->hard_start_xmit = rtl8192_8023_hard_start_xmit;
  57 @@ -6372,7 +6375,6 @@ static int __devinit rtl8192_pci_probe(s
  58         dev->do_ioctl = rtl8192_ioctl;
  59         dev->set_multicast_list = r8192_set_multicast;
  60         dev->set_mac_address = r8192_set_mac_adr;
  61 -#endif
  62
  63           //DMESG("Oops: i'm coming\n");
  64  #if WIRELESS_EXT >= 12