openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
184,161 Commits 18 Branches 27 Tags 3.4 GiB
Commit Graph

65 Commits

Author SHA1 Message Date
David S. Miller 19bc291c99 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/rt2x00/rt2800pci.c
 2010-02-25 23:26:21 -08:00
Frederic Leroy e2117cea27 staging: rtl8192su: fix compile error from wireless-testing commit 
In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the rtl8192su driver in staging.

The conflict is resolved by changing rtl8192su
to use the definition from include/linux/ieee80211.h.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
 2010-02-19 15:52:41 -05:00
Stephane Glondu 488d374962 staging: rtl8192su: add USB VID/PID for HWNUm-300 
The Hercules Wireless N USB mini (HWNUm-300) uses the RTL8191S chipset
and seems to work with this driver.

Signed-off-by: Stephane Glondu <steph@glondu.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-12-23 11:27:47 -08:00
George Kadianakis 55c7d5fc18 staging: fix rtl8192su compilation errors with mac80211 
This patch series fixes compilation problems that were caused by
function naming conflicts between the rtl8192su driver and the
mac80211 stack.

Signed-off-by: George Kadianakis <desnacked at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-12-23 11:27:47 -08:00
Roel Kluin aad445f8cc Staging: rtl8192su: fix test for negative error in rtl8192_rx_isr() 
The error tested for is negative

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-12-23 11:27:46 -08:00
André Goddard Rosa bbc9a9916b Staging: fix assorted typos all over the place 
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-12-11 12:23:20 -08:00
Randy Dunlap 76e4079807 Staging: RTL8192SU depends on USB 
USB device driver needs to depend on USB to prevent build errors:

ERROR: "usb_kill_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_control_msg" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-12-11 12:23:18 -08:00
Huang Weiyi 349f535cbd Staging: rtl8187su: remove unused #include <linux/version.h> 
Remove unused #include <linux/version.h>('s) in
  drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
  drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c
  drivers/staging/rtl8192su/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
Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus 
Conflicts:

	kernel/irq/chip.c
 2009-12-07 18:36:35 +01:00
Adam Buchbinder 6070d81eb5 tree-wide: fix misspelling of "definition" in comments 
"Definition" is misspelled "defintion" in several comments; this
patch fixes them. No code changes.

Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 2009-12-04 23:41:47 +01: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
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
Jeff Mahoney d1aed89996 Staging: rtl8192su: add linux/vmalloc.h 
Some arches don't provide vmalloc.h through the includes already included
in rtl8192su. This patch adds it.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:17 -07:00
Jeff Mahoney 8109c2fd05 Staging: rtl8192su: stop using skb->tail 
This patch replaces uses of skb->tail with skb_tail_pointer(skb).

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:16 -07:00
Jeff Mahoney f357e6ecbc Staging: rtl8192su: fixup size comparison warning 
sizeof(val) returns type unsigned long. count is already unsigned long, so
just use that. This fixes a compile warning.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:16 -07:00
Jeff Mahoney 859ebd9748 Staging: rtl8192su: fix up printk warnings 
This patch addresses printk warnings.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:16 -07:00
Jeff Mahoney b1af19f19d Staging: rtl8192su: compile fixes 
This patch removes -fhard-float and the software float helpers. In-kernel
 floating point is not allowed.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:02:16 -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 c0593dd934 Staging: rtl8192su/ieee80211: move rtl8192su specific code out from ieee80211.h 
Move rtl8192su specific code out from ieee80211.h to ieee80211_r8192s.h.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz f59d012790 Staging: rtl8192su/ieee80211: ieee80211.h cleanups 
* remove unused / duplicated definitions
* remove unused / used only once typedefs
* fix comments, remove useless ones
* convert defines to enums where appropriate
* use __func__ instead of __FUNCTION__
* make some minor coding style fixes
* misc cleanups

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz 86467e7bc1 Staging: rtl8192su/ieee80211: remove unused ieee80211_wx_get_encode_ext() 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz 7d74deed7c Staging: rtl8192su/ieee80211: remove unused IEEE80211_PRINT_STR() 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz d643db940d Staging: rtl8192su: 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:42 -07:00
Bartlomiej Zolnierkiewicz 793f96b585 Staging: rtl8192su/ieee80211: remove superfluous container_of definition 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz fbe0051dbb Staging: rtl8192su/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:42 -07:00
Bartlomiej Zolnierkiewicz 0766f233b6 Staging: rtl8192su: remove JOHN_DUMP[_TXDESC] ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz 5d9baea95f Staging: rtl8192su: make private ieee80211 stack really private 
* rename ieee80211_{init,exit}() to ieee80211_debug_{init,exit}()
* make private ieee80211 stack really private
* cleanup Makefile
* remove superfluous ieee80211_* defines
* remove superfluous EXPORT_SYMBOLs

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:42 -07:00
Bartlomiej Zolnierkiewicz add6e6342d Staging: rtl8192su: remove more unused files 
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 35c1b46291 Staging: rtl8192su: 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:40 -07:00
Bartlomiej Zolnierkiewicz 9f7f00cd28 Staging: rtl8192su: 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:39 -07:00
Bartlomiej Zolnierkiewicz 0f29f5871c Staging: rtl8192su: remove RTL8192SU ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:39 -07:00
Bartlomiej Zolnierkiewicz 60083ee0c2 Staging: rtl8192su: remove RTL8192SE ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:39 -07:00
Bartlomiej Zolnierkiewicz bd7b22c91a Staging: rtl8192su: remove RTL8192SU_DISABLE_IQK ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:39 -07:00
Bartlomiej Zolnierkiewicz 8b804677f9 Staging: rtl8192su: remove RTL8192S_PREPARE_FOR_NORMAL_RELEASE ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 68b6f506c6 Staging: rtl8192su: remove RTL8190_Download_Firmware_From_Header ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 642ec04b78 Staging: rtl8192su: remove RTL8192SU_USB_PHY_TEST ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 16fb15baea Staging: rtl8192su: remove RTL8192SU_ASIC_VERIFICATION ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz cd2c3c978f Staging: rtl8192su: remove RTL8192SU_FPGA_2MAC_VERIFICATION ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 1522987a7f Staging: rtl8192su: remove RTL8192SU_FPGA_UNSPECIFIED_NETWORK ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 3a63e8287d Staging: rtl8192su: remove RTL8192SU_USE_PARAM_TXPWR ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 385b330228 Staging: rtl8192su: remove DISABLE_BB_RF ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz b8bd14b912 Staging: rtl8192su: remove RTL8192S_DISABLE_FW_DM ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz f063ba768e Staging: rtl8192su: remove RTL8192SU_DISABLE_CCK_RATE ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:38 -07:00
Bartlomiej Zolnierkiewicz 5b36d3bfbc Staging: rtl8192su: remove USB_TX_DRIVER_AGGREGATION_ENABLE ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:37 -07:00
Bartlomiej Zolnierkiewicz db28336458 Staging: rtl8192su: remove USB_RX_AGGREGATION_SUPPORT ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:37 -07:00
Bartlomiej Zolnierkiewicz a7e3c1d621 Staging: rtl8192su: remove EEPROM_OLD_FORMAT_SUPPORT ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:37 -07:00
Bartlomiej Zolnierkiewicz ee13be2f94 Staging: rtl8192su: remove USE_ONE_PIPE ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:37 -07:00
Bartlomiej Zolnierkiewicz b8545591a9 Staging: rtl8192su: 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:37 -07:00
Bartlomiej Zolnierkiewicz b81ad777b9 Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2009-09-15 12:01:37 -07:00