UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
174,570 Commits 6 Branches 27 Tags 3.2 GiB
Commit Graph

70 Commits

Author SHA1 Message Date
Huang Weiyi 090679c9e8 Staging: rtl8187se: remove unused #include <linux/version.h> 
Remove unused #include <linux/version.h>('s) in
  drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
  drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
  drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-12-11 12:23:09 -08:00
Linus Torvalds 4ef58d4e2a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
  tree-wide: fix misspelling of "definition" in comments
  reiserfs: fix misspelling of "journaled"
  doc: Fix a typo in slub.txt.
  inotify: remove superfluous return code check
  hdlc: spelling fix in find_pvc() comment
  doc: fix regulator docs cut-and-pasteism
  mtd: Fix comment in Kconfig
  doc: Fix IRQ chip docs
  tree-wide: fix assorted typos all over the place
  drivers/ata/libata-sff.c: comment spelling fixes
  fix typos/grammos in Documentation/edac.txt
  sysctl: add missing comments
  fs/debugfs/inode.c: fix comment typos
  sgivwfb: Make use of ARRAY_SIZE.
  sky2: fix sky2_link_down copy/paste comment error
  tree-wide: fix typos "couter" -> "counter"
  tree-wide: fix typos "offest" -> "offset"
  fix kerneldoc for set_irq_msi()
  spidev: fix double "of of" in comment
  comment typo fix: sybsystem -> subsystem
  ...
 2009-12-09 19:43:33 -08:00
Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus 
Conflicts:

	kernel/irq/chip.c
 2009-12-07 18:36:35 +01:00
Thadeu Lima de Souza Cascardo 94e2bd6888 tree-wide: fix some typos and punctuation in comments 
fix some typos and punctuation in comments

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 2009-12-04 15:39:48 +01:00
David S. Miller ff9c38bba3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	net/mac80211/ht.c
 2009-12-01 22:13:38 -08:00
Bartlomiej Zolnierkiewicz fb08808ca2 Staging: update TODO files 
Remove my mail address.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-11-30 16:39:42 -08:00
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
 2009-11-18 22:19:03 -08:00
Randy Dunlap b881c6cbb3 Staging: fix wireless drivers depends 
These drivers can (erroneously) be enabled even when
CONFIG_NET=n, CONFIG_NETDEVICES=n, CONFIG_WLAN=n, etc.
Stop this.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-10-30 14:47:44 -07:00
Herton Ronaldo Krzesinski a010a33752 Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload 
On rtl81* additions, they had its wireless stack made builtin instead of
separated modules. But try_module_get/module_put in stack were kept,
they are uneeded with the stack builtin and makes rtl81* modules
impossible to remove on a system with an rtl81* card. request_module
calls are also uneeded with stack builtin, so remove them too.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-10-30 14:47:43 -07:00
Larry Finger 125b181aec staging: Add proper selection of WIRELESS_EXT and WEXT_PRIV 
After the incorporation of the patch entitled "wext: refactor", some
of the wireless drivers in drivers/staging fail to build because they
need to have CONFIG_WIRELESS_EXT and CONFIG_WEXT_PRIV defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
 2009-10-07 16:39:43 -04:00
Michael Buesch b3184e1ec3 Staging: rtl8187se: Fix comment-out-typo 
This fixes a comment-out-typo that resulted in a dangling if-branch.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:17 -07:00
Stoyan Gaydarov b6ac161364 Staging: ARRAY_SIZE changes 
These changes were a direct result of using a semantic patch
More information can be found at http://www.emn.fr/x-info/coccinelle/

Signed-off-by: Stoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:06 -07:00
Bartlomiej Zolnierkiewicz e1b19da118 Staging: rtl8187se/ieee80211: convert MMIE_TYPE_* defines to enums 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz bea385aceb Staging: rtl8187se/ieee80211: ieee80211.h reorderings 
Reorder the code in ieee80211.h for easier comparisions with
rtl8192su's version of the file.

While at it:
* use IEEE80211_4ADDR_LEN for IEEE80211_LEN definition
* remove unused country_code_type_t typedef
* make some minor coding style fixes

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 03ea5099ad Staging: rtl8187se/ieee80211: switch to use <linux/ieee80211.h> 
While at it:
* remove some commented out code
* remove some unused definitions

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 0ddd6f6f44 Staging: rtl8187se: rename struct ieee80211_hdr_QOS to struct ieee80211_hdr_4addrqos 
Rename struct ieee80211_hdr_QOS to struct ieee80211_hdr_4addrqos
and QOS_ctl field to qos_ctl (to match the naming used by rtl8192su).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 726f11e810 Staging: rtl8187se: rename struct ieee80211_hdr_3addr_qos to struct ieee80211_hdr_3addrqos 
Rename struct ieee80211_hdr_3addr_QOS to struct ieee80211_hdr_3addrqos
and QOS_ctl field to qos_ctl (to match the naming used by rtl8192su).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 0604384d4b Staging: rtl8187se: rename struct ieee80211_hdr to struct ieee80211_hdr_4addr 
ieee80211_hdr name is too generic so use ieee80211_hdr_4addr one instead
(which matches the naming used by rtl8192su driver).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz f5ce8fe1fd Staging: rtl8187se: remove ENABLE_IPS ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 343c17b050 Staging: rtl8187se/ieee80211: remove NOT_YET ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 946c2adde8 Staging: rtl8187se/ieee80211: remove FEDORACORE_9 ifdef 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:41 -07:00
Bartlomiej Zolnierkiewicz 846eec42ba Staging: rtl8187se/ieee80211: remove OPENSUSE_SLED ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:40 -07:00
Bartlomiej Zolnierkiewicz fd882783ab Staging: rtl8187se: cleanup r8180_core.c 
* remove commented out code
* remove useless comments
* beautify code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz 22eec79469 Staging: rtl8187se: cleanup r8180_rtl8225z2.c 
* make read_rtl8225() static
* make tables static const
* remove commented out code
* remove useless comments
* beautify code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz 02236f3fd5 Staging: rtl8187se: remove unused definitions from r8180.h 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz 7abb66eba4 Staging: rtl8187se: remove unused definitions from r8180_hw.h 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz b6d11c07e5 Staging: rtl8187se: merge r8180_pm.c with r8180_core.c 
* merge r8180_pm.c with r8180_core.c
* make functions static

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz b72490a5f9 Staging: rtl8187se: cleanup r8180_pm.c 
* remove unused rtl8180_{save_state,enable_wake}()
* remove commented out code
* beautify code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz 44a7dcbc49 Staging: rtl8187se: merge r8180_rtl8225.c with r8180_rtl8225z2.c 
* merge r8180_rtl8225.c with r8180_rtl8225z2.c
* make functions static
* make tables static const
* remove unused rtl8225_set_gain()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz 322f3f2fa7 Staging: rtl8187se: cleanup r8180_rtl8225.c 
* remove empty rtl8225_host_usb_init()
* remove commented out code
* remove useless comments
* beautify code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz e99b82d558 Staging: rtl8187se: remove unused rtl8225_rf_* functions 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:31 -07:00
Bartlomiej Zolnierkiewicz ff95485305 Staging: rtl8187se: remove debugging code from r8180_core.c 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:30 -07:00
Bartlomiej Zolnierkiewicz 6dc1585fe4 Staging: rtl8187se: remove unused radio frontends 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:30 -07:00
Bartlomiej Zolnierkiewicz 5521a513e5 Staging: rtl8187se: remove dead code 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:30 -07:00
Bartlomiej Zolnierkiewicz 6a9a9e42b6 Staging: rtl8187se: remove CONFIG_RTL8180_IO_MAP ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:29 -07:00
Bartlomiej Zolnierkiewicz f19fd33577 Staging: rtl8187se: remove CONFIG_RTL8185B ifdefs 
CONFIG_RTL8185B is defined in drivers/staging/rtl8187se/r8180_hw.h.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:29 -07:00
Bartlomiej Zolnierkiewicz 5474405fd6 Staging: rtl8187se: remove CONFIG_RTL818x_S ifdefs 
CONFIG_RTL818x_S is defined in drivers/staging/rtl8187se/r8180_hw.h.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:29 -07:00
Bartlomiej Zolnierkiewicz 9a5aabffd1 Staging: rtl8187se: remove THOMAS_TURBO ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:29 -07:00
Bartlomiej Zolnierkiewicz 2e0baea977 Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:28 -07:00
Bartlomiej Zolnierkiewicz 5212499a7a Staging: rtl8187se: remove ENABLE_DOT11D ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:28 -07:00
Bartlomiej Zolnierkiewicz 0bd2f8efe9 Staging: rtl8187se: add TODO 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:28 -07:00
Bartlomiej Zolnierkiewicz 7fdb78d097 Staging: rtl8187se/ieee80211: remove superfluous JOHN_* ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:28 -07:00
Bartlomiej Zolnierkiewicz 8f75675c3a Staging: rtl8187se/ieee80211: remove unused dump_chnl_map() 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:28 -07:00
Bartlomiej Zolnierkiewicz c6e43bc83f Staging: rtl8187se/ieee80211: remove superfluous ieee80211_* defines 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:27 -07:00
Bartlomiej Zolnierkiewicz 30bb89f333 Staging: rtl8187se/ieee80211: remove dead _RTL8187_EXT_PATCH_ code 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:27 -07:00
Bartlomiej Zolnierkiewicz 8efff1758a Staging: rtl8187se: remove support for older wireless extensions 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:27 -07:00
Bartlomiej Zolnierkiewicz 0370453f6c Staging: rtl8187se: remove kernel version compatibility wrappers 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:27 -07:00
Bartlomiej Zolnierkiewicz a974762356 Staging: rtl8187se: remove unused ieee80211_crypt.h 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:27 -07:00
Bartlomiej Zolnierkiewicz fd9b8d6e29 Staging: rtl8187se: remove duplicate dot11d.h and ieee80211.h includes 
Always use includes from ieee80211/ subdirectory.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:27 -07:00
Bartlomiej Zolnierkiewicz 015ffd82da Staging: rtl8187se/ieee80211: remove unused files 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:26 -07:00