rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch

   1 --- include/os/rt_linux.h.orig  2010-11-26 04:18:41.000000000 +0100
   2 +++ include/os/rt_linux.h       2010-12-01 14:58:46.000000000 +0100
   3 @@ -111,10 +111,10 @@
   4
   5  #ifdef CONFIG_STA_SUPPORT
   6  #ifdef RTMP_MAC_PCI
   7 -#define STA_PROFILE_PATH                       "/etc/Wireless/RT2860STA/RT2860STA.dat"
   8 +#define STA_PROFILE_PATH                       "/etc/Wireless/RT3562STA/RT3562STA.dat"
   9  #define STA_DRIVER_VERSION                     "2.4.1.1"
  10  #ifdef MULTIPLE_CARD_SUPPORT
  11 -#define CARD_INFO_PATH                 "/etc/Wireless/RT2860STA/RT2860STACard.dat"
  12 +#define CARD_INFO_PATH                 "/etc/Wireless/RT3562STA/RT3562STACard.dat"
  13  #endif // MULTIPLE_CARD_SUPPORT //
  14  #endif // RTMP_MAC_PCI //
  15
  16 --- os/linux/pci_main_dev.c.orig        2010-12-17 19:59:25.000000000 +0100
  17 +++ os/linux/pci_main_dev.c     2010-12-17 20:00:12.000000000 +0100
  18 @@ -90,14 +90,15 @@
  19  MODULE_VERSION(STA_DRIVER_VERSION);
  20  #endif
  21  #endif // CONFIG_STA_SUPPORT //
  22 -
  23 +MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver");
  24 +MODULE_LICENSE("GPL");
  25
  26  //
  27  // Our PCI driver structure
  28  //
  29  static struct pci_driver rt2860_driver =
  30  {
  31 -    name:       "rt2860",
  32 +    name:       "rt3562",
  33      id_table:   rt2860_pci_tbl,
  34      probe:      rt2860_probe,
  35  #if LINUX_VERSION_CODE >= 0x20412
  36 @@ -317,9 +318,9 @@
  37         }
  38
  39  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
  40 -       print_name = pci_dev ? pci_name(pci_dev) : "rt2860";
  41 +       print_name = pci_dev ? pci_name(pci_dev) : "rt3562";
  42  #else
  43 -       print_name = pci_dev ? pci_dev->slot_name : "rt2860";
  44 +       print_name = pci_dev ? pci_dev->slot_name : "rt3562";
  45  #endif // LINUX_VERSION_CODE //
  46
  47         if ((rv = pci_request_regions(pci_dev, print_name)) != 0)