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
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
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
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
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
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
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
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
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
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
Bartlomiej Zolnierkiewicz
622d501862
Staging: rtl8192su: 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:37 -07:00
Bartlomiej Zolnierkiewicz
3bd709f28f
Staging: rtl8192su: 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:28 -07:00
Bartlomiej Zolnierkiewicz
1ec9e48dbf
Staging: rtl8192su: 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:28 -07:00
Bartlomiej Zolnierkiewicz
2a7d71ad57
Staging: rtl8192su: 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
Greg Kroah-Hartman
ce9c010c5c
Staging: rtl8192su: fix build error
...
This fixes a build error when selecting the rtl8192su driver as a
module. This has been reported by me, and the opensuse kernel developer
team, and I finally tracked it down.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-08-07 16:12:03 -07:00
Bartlomiej Zolnierkiewicz
77b9288197
Staging: rtl8192su: convert to net_device_ops
...
commit e3804cbebb
removed
COMPAT_NET_DEV_OPS so this change is needed to make rtl8192su
buildable again.
Loosely based on Alexander's patch for rtl8187se, untested.
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-07-12 13:21:45 -07:00
Jerry Chuang
5f53d8ca3d
Staging: add rtl8192SU wireless usb driver
...
Driver from Realtek for the Realtek RTL8192 USB wifi device
Based on the r8187 driver from Andrea Merello <andreamrl@tiscali.it> and
others.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:53 -07:00