aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x
diff options
context:
space:
mode:
authorAndrea Merello <andrea.merello@gmail.com>2014-03-26 16:04:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-03-27 14:20:09 -0400
commit1eba648f998ef9c31b8cf062754a4a7b4ab9001f (patch)
treee24539d9bed48ee2cacd574a0d34fcb9297ae33b /drivers/net/wireless/rtl818x
parent24b5fbf9d85cae3c9a320d23bddedd23a487db42 (diff)
rtl8180: enable rtl8187se support
Finally make rtl8187se works (hopefylly). This patch adds PCI ID for rtl8187, updates copyright notes and updates MODULE_DESCRIPTION. Signed-off-by: Andrea Merello <andrea.merello@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtl818x')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180/dev.c39
1 files changed, 35 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 2046fe2f1065..98d8256f0377 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -1,15 +1,42 @@
1 1
2/* 2/* Linux device driver for RTL8180 / RTL8185 / RTL8187SE
3 * Linux device driver for RTL8180 / RTL8185
4 * 3 *
5 * Copyright 2007 Michael Wu <flamingice@sourmilk.net> 4 * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
6 * Copyright 2007 Andrea Merello <andrea.merello@gmail.com> 5 * Copyright 2007,2014 Andrea Merello <andrea.merello@gmail.com>
7 * 6 *
8 * Based on the r8180 driver, which is: 7 * Based on the r8180 driver, which is:
9 * Copyright 2004-2005 Andrea Merello <andrea.merello@gmail.com>, et al. 8 * Copyright 2004-2005 Andrea Merello <andrea.merello@gmail.com>, et al.
10 * 9 *
11 * Thanks to Realtek for their support! 10 * Thanks to Realtek for their support!
12 * 11 *
12 ************************************************************************
13 *
14 * The driver was extended to the RTL8187SE in 2014 by
15 * Andrea Merello <andrea.merello@gmail.com>
16 *
17 * based also on:
18 * - portions of rtl8187se Linux staging driver, Copyright Realtek corp.
19 * - other GPL, unpublished (until now), Linux driver code,
20 * Copyright Larry Finger <Larry.Finger@lwfinger.net>
21 *
22 * A huge thanks goes to Sara V. Nari who forgives me when I'm
23 * sitting in front of my laptop at evening, week-end, night...
24 *
25 * A special thanks goes to Antonio Cuni, who helped me with
26 * some python userspace stuff I used to debug RTL8187SE code, and who
27 * bought a laptop with an unsupported Wi-Fi card some years ago...
28 *
29 * Thanks to Larry Finger for writing some code for rtl8187se and for
30 * his suggestions.
31 *
32 * Thanks to Dan Carpenter for reviewing my initial patch and for his
33 * suggestions.
34 *
35 * Thanks to Bernhard Schiffner for his help in testing and for his
36 * suggestions.
37 *
38 ************************************************************************
39 *
13 * This program is free software; you can redistribute it and/or modify 40 * This program is free software; you can redistribute it and/or modify
14 * it under the terms of the GNU General Public License version 2 as 41 * it under the terms of the GNU General Public License version 2 as
15 * published by the Free Software Foundation. 42 * published by the Free Software Foundation.
@@ -33,10 +60,14 @@
33 60
34MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); 61MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
35MODULE_AUTHOR("Andrea Merello <andrea.merello@gmail.com>"); 62MODULE_AUTHOR("Andrea Merello <andrea.merello@gmail.com>");
36MODULE_DESCRIPTION("RTL8180 / RTL8185 PCI wireless driver"); 63MODULE_DESCRIPTION("RTL8180 / RTL8185 / RTL8187SE PCI wireless driver");
37MODULE_LICENSE("GPL"); 64MODULE_LICENSE("GPL");
38 65
39static DEFINE_PCI_DEVICE_TABLE(rtl8180_table) = { 66static DEFINE_PCI_DEVICE_TABLE(rtl8180_table) = {
67
68 /* rtl8187se */
69 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8199) },
70
40 /* rtl8185 */ 71 /* rtl8185 */
41 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8185) }, 72 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8185) },
42 { PCI_DEVICE(PCI_VENDOR_ID_BELKIN, 0x700f) }, 73 { PCI_DEVICE(PCI_VENDOR_ID_BELKIN, 0x700f) },