Commit Graph

148 Commits

Author SHA1 Message Date
Andy Shevchenko
771dafdc38 staging: rtl8192su: don't use own isxdigit() method
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:03:21 -07:00
Florian Schilhabel
242f5a709c staging: rtl8192su: added ioctl[SIOCSIWPMKSA] implementation
errors like:
ioctl[SIOCSIWPMKSA]: Invalid argument
should now be gone.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:22 -07:00
Florian Schilhabel
53faa56b78 staging: rtl8192su: merge changes in rtl819x_HTProc.c; still incomplete
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:22 -07:00
Florian Schilhabel
8388fd3605 staging: rtl8192su: merge changes into ieee80211_rx_ADDBARsp()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:22 -07:00
Florian Schilhabel
bb21199a01 staging: rtl8192su: merge updated ieee80211_crypto_ops()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:22 -07:00
Florian Schilhabel
353db17dce staging: rtl8192su: merge changes in ieee80211_tkip_data()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:21 -07:00
Florian Schilhabel
d4dfd8065d staging: rtl8192su: merge changes in ieee80211_authentication_req()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:21 -07:00
Florian Schilhabel
124a27e43e staging: rtl8192su: cleanup in ieee80211_softmac.c
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:21 -07:00
Florian Schilhabel
ab81f74e4a staging: rtl819su: merge changes in softmac_ps_mgmt_xmit()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:21 -07:00
Florian Schilhabel
e2e8649318 staging: rtl819su: update MgntQuery_MgntFrameTxRate()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:20 -07:00
Florian Schilhabel
c9b4d3ea11 staging: rtl819su: update probe_rq_parse()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:20 -07:00
Florian Schilhabel
26cc71540a staging: rtl819su: ieee80211_associate_procedure_wq() update
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:20 -07:00
Florian Schilhabel
67db39324f staging: rtl8192su: remove a section mismatch warning
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 12:00:19 -07:00
Florian Schilhabel
1da45703f6 staging: rtl8192su: merge changes in r8192U_wx.c
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:05 -07:00
Florian Schilhabel
e415f0a14c staging: rtl8192su: update TODO
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:04 -07:00
Florian Schilhabel
653e99e316 staging: rtl8192su: various updates
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:04 -07:00
Florian Schilhabel
8280a7abd6 staging: rtl819esu: cleanup; r8192S_Efuse.c, r8192S_Efuse.h
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:04 -07:00
Florian Schilhabel
2de027e51d staging: rtl8192su: updated r8192SU_HWImg.c, r8192SU_HWImg.h
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:04 -07:00
Florian Schilhabel
5d4d454c30 staging: rtl8192su: remove some unused code, cleanup
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:03 -07:00
Florian Schilhabel
47790cb226 staging: rtl8192su: more code cleanup
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:03 -07:00
Florian Schilhabel
24fa92c5f7 staging: rtl8192su: code cleanup
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:03 -07:00
Florian Schilhabel
e2e539065f staging: rtl8192su: cleanup in ieee80211_tx.c, ieee80211_wx.c
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:03 -07:00
Florian Schilhabel
5889ef2dac staging: rtl8192su: clean ieee80211_crypt.c
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:03 -07:00
Florian Schilhabel
01ced242f2 staging: rtl8192su: clean dot11d.[c|h]
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:02 -07:00
Florian Schilhabel
56c93a0537 staging: rtl8192su: some work on dm_check_edca_turbo()
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:02 -07:00
Florian Schilhabel
d9c5cc9887 staging: rtl8192su: update r8192U.h
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:58:02 -07:00
Florian Schilhabel
03dff6265d staging: rtl8192su: r8192U.h, clean header
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:52 -07:00
Florian Schilhabel
0825c40f95 staging: rtl8192su: r8192S_phy.c, remove unused code; 2nd part
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:50 -07:00
Florian Schilhabel
dc7bbaa4ff staging: rtl8192su: r8192S_phy.c, remove unused code
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:50 -07:00
Florian Schilhabel
c681318577 staging: rtl819ssu: clean r8192S_hw.h
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:50 -07:00
Florian Schilhabel
a6f81aaf95 staging: rtl8192su: update to r8192S_Efuse.c, r8192xU_cmdpkt.c
cosmetics, various updates to reflect realteks upstream changes.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:50 -07:00
Florian Schilhabel
4203c5b70d staging: rtl8192su: cosmetics in r8192S_Efuse.c
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:49 -07:00
Florian Schilhabel
d547139911 staging: rtl8192su: update rtl819x_set_channel_map()
This function is now on par with the latest realtek drivers.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:49 -07:00
Florian Schilhabel
638b5acd4d staging: rtl8192su: fix a compiler warning
fix for:
drivers/staging/rtl8192su/r8192U_core.c: In function ‘rtl8192SU_MacConfigAfterFwDownload’:
drivers/staging/rtl8192su/r8192U_core.c:4403:24: warning: comparison between ‘rtl819xUsb_loopback_e’ and ‘enum _RTL8192SUSB_LOOPBACK’
drivers/staging/rtl8192su/r8192U_core.c:4405:30: warning: comparison between ‘rtl819xUsb_loopback_e’ and ‘enum _RTL8192SUSB_LOOPBACK’

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-22 11:57:49 -07:00
Andy Shevchenko
3ff16c257a Staging: don't use custom hex_to_bin() implementation
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 15:02:17 -07:00
Andreas Herrmann
0374e91c90 Staging: rtl81xx: Fix build problems when CONFIG_CRYPTO=n
Select CONFIG_CRYPTO for all rtl81xx wireless drivers

... to avoid build problems like:

ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8187se/r8187se.ko] undefined!
ERROR: "crypto_alloc_base" [drivers/staging/rtl8187se/r8187se.ko] undefined!
ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "crypto_alloc_base" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "crypto_alloc_base" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined!
ERROR: "crypto_destroy_tfm" [drivers/staging/rtl8192e/r8192e_pci.ko] undefined!
ERROR: "crypto_alloc_base" [drivers/staging/rtl8192e/r8192e_pci.ko] undefined!

when drivers are built as modules but CONFIG_CRYPTO=n.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-18 16:41:50 -07:00
Jiri Kosina
bb71770cdb Staging: rtl8192su: remove all code dependent on LINUX_VERSION_CODE
Remove all code which is dead for in-kernel driver due to being
ifdefed by LINUX_VERSION_CODE.

While at it, also remove surrounding code which is commented out,
or '#if 1' nops.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-18 15:17:12 -07:00
Ben Hutchings
41a38d9e63 Staging: rtl8192su: Fix procfs code for interfaces not named wlan0
The current code creates directories in procfs named after interfaces,
but doesn't handle renaming.  This can result in name collisions and
consequent WARNINGs.  It also means that the interface name cannot
reliably be used to remove the directory - in fact the current code
doesn't even try, and always uses "wlan0"!

Since the name of a proc_dir_entry is embedded in it, use that when
removing it.

Add a netdev notifier to catch interface renaming, and remove and
re-add the directory at this point.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
2010-06-18 15:16:21 -07:00
Ben Hutchings
9a3dfa0555 Staging: rtl8192su: Clean up in case of an error in module initialisation
Currently various resources may be leaked in case of an error.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-18 15:16:21 -07:00
Greg Kroah-Hartman
c8d1a12692 Merge staging-next tree into Linus's latest version
Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-21 12:48:55 -07:00
Julia Lawall
94002c07ff Staging: Use kmemdup
Use kmemdup when some other buffer is immediately copied into the
allocated region.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to,size,flag;
statement S;
@@

-  to = \(kmalloc\|kzalloc\)(size,flag);
+  to = kmemdup(from,size,flag);
   if (to==NULL || ...) S
-  memcpy(to, from, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-17 16:31:15 -07:00
Julia Lawall
7a6cb0d549 Staging: Use kcalloc or kzalloc
Use kcalloc or kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,y,flags;
statement S;
type T;
@@

x =
-   kmalloc
+   kcalloc
           (
-           y * sizeof(T),
+           y, sizeof(T),
                flags);
 if (x == NULL) S
-memset(x, 0, y * sizeof(T));

@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
2010-05-14 14:02:56 -07:00
Florian Schilhabel
3dfe08e607 Staging: rtl8192su: led update
derived from Realteks driver.
leds are now working.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-14 13:55:59 -07:00
Florian Schilhabel
5c2af91bbc Staging: rtl819su: added r8192SU_led.c/.h
added the necessary infrastructure for the leds on the device
this is a port from Realteks driver.

leds are now working partially.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-14 13:54:55 -07:00
Anand Gadiyar
935e99fb07 staging: trivial: fix typo "seperate"
s/seperate/separate

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Jiri Kosina <trivial@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-14 13:16:10 -07:00
Julia Lawall
324148788b Staging: Drop memory allocation cast
Drop cast on the result of kmalloc and similar functions.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
@@

- (T *)
  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 16:06:48 -07:00
H Hartley Sweeten
b63eaed0da staging: rtl8192x: sync the various rtl819x_Qos.h files
The rtl8192e, rtl8192su, and rtl8192u drivers all share what appears
to be a common private ieee80211 stack.  Various patches have been
applied to the rtl819x_Qos.h file for some of the drivers but not the
others.

This sync's the files based on all the applied patches.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 15:08:23 -07:00
H Hartley Sweeten
a09fcbd70e staging: rtl8192x: sync the various rtl819x_TSProc.c files
The rtl8192e, rtl8192su, and rtl8192u drivers all share what appears
to be a common private ieee80211 stack.  Various patches have been
applied to the rtl819x_TSProc.c file for some of the drivers but not
the others.

This sync's the files based on all the applied patches.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 15:07:28 -07:00
Florian Schilhabel
495c57f5f0 Staging: rtl8192su: all rtl8192su chips have the 93c46 eprom
all rtl8192su chips have the 93c46 eprom. (no 93c56)
it it theoretically safe to remove the 93c56 definitions and some unneeded code.
if your device stops working after this patch, please send me a mail
and include some information about your device:
* dmesg
* lsusb -v
* _exact_ chipset (version)
* vendor
* everything else, that may help

plus cosmetics.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:04 -07:00
Florian Schilhabel
e695b470b3 Staging: rtl8192su: refactored FirmwareCheckReady
replaced if..else if..else by a switch.
this is hopefully easier to read.

plus cosmetics.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-11 11:36:04 -07:00