diff options
author | root <root@rshg054.dnsready.net> | 2012-12-29 02:13:48 -0800 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-12-29 02:13:48 -0800 |
commit | 5dd7ed82e788ebad2e920e0f2db7468cc6547cfe (patch) | |
tree | f467412e09912ababcd8fe6c05193d829f514dcd /community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch | |
parent | 3009e8addb4a894329bf8ab3e8fb763361833978 (diff) |
Sat Dec 29 02:10:20 PST 2012
Diffstat (limited to 'community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch')
-rw-r--r-- | community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch new file mode 100644 index 000000000..a0d00d6e3 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) |