bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-23 09:05:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
232,544 Commits 1 Branch 927 Tags
80751e2b8ffcbbe065e850d943301aa1ab219599
Commit Graph

23 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
ea3398a1ae Staging: Merge 2.6.37-rc5 into staging-next 
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-12-07 10:47:56 -08:00
Greg Kroah-Hartman
8d7ee9c498 Merge branch 'master' into work 2010-11-29 10:44:22 -08:00
Arnd Bergmann
451a3c24b0 BKL: remove extraneous #include <smp_lock.h> 
The big kernel lock has been removed from all these files at some point,
leaving only the #include.

Remove this too as a cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 2010-11-17 08:59:32 -08:00
Dan Carpenter
832855354b Staging: rtl8712: signedness bug in init 
PollingCnt is 20 and that means we loop 20 times and then run the
timeout code.  After the end of the loop PollingCnt should be -1 but
because it's an unsigned char, it's actually 255 and the timeout
code never runs.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-11-16 12:25:53 -08:00
Joe Perches
e33196e108 drivers/staging: Remove unnecessary casts of netdev_priv 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-11-16 12:06:47 -08:00
Joe Perches
859171ca92 drivers/staging: Remove unnecessary semicolons 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-11-16 12:06:47 -08:00
Larry Finger
a10bb4fb19 staging: r8712u: Update TODO for sparse fixes 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-11-10 16:28:29 -08:00
Larry Finger
4c510e95ae staging: r8712u: Remove extraneous variables from osdep_service.h 
Jesper Juhl submitted a patch to remove one extraneous variable in
this file; however, there are several others.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-11-09 16:32:24 -08:00
Jesper Juhl
a2ac9d69d6 staging: r8712u: Remove unneeded local variable in _malloc in osdep_service.h header 
The variable 'pbuf' is not needed.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-11-09 16:32:24 -08:00
Thomas Gleixner
45f4d02435 staging: Final semaphore cleanup 
Fixup the last remaining users of DECLARE_MUTEX and init_MUTEX.

Scripted conversion, resulting code is binary equivalent.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
LKML-Reference: <20100907125057.278833764@linutronix.de>
 2010-10-30 12:12:50 +02:00
Tracey Dent
4580cd7ec2 Staging: rtl8712: Makefile: replace the use of <module>-objs with <module>-y 
Changed <module>-objs to <module>-y in Makefile.

Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-10-08 07:23:45 -07:00
Andy Shevchenko
a5ed57a3ec staging: rtl8712: '&pointer[0]' to 'pointer' fix 
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-09-20 16:10:56 -07:00
Andy Shevchenko
0ce53f3d15 staging: rtl8712: use '%pM' format to print MAC address 
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-09-16 12:26:11 -07:00
Andy Shevchenko
91facdbe50 staging: rtl8712: throw away custom hex_to_bin() 
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-09-08 01:59:53 -07:00
Larry Finger
ebf993ba2b staging: r8712u: Update copy-to list for patches 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 15:20:06 -07:00
Larry Finger
74b4ad79ed staging: r8712u: Add TODO to driver files 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 10:59:53 -07:00
Larry Finger
5a3acb043a staging: r8712u: Update driver version to v7_0.20100831 
Signed-off-by: Albert Wang <albert_wang@realtek.com.tw>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 10:59:53 -07:00
Larry Finger
2e04fc838a staging: r8712u: Fix potential crash issue 
When the driver received the Addba request frame from AP, a crash could
occur.

Signed-off-by: Albert Wang <albert_wang@realtek.com.tw>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 10:59:53 -07:00
Larry Finger
d19b86473e staging: r8712u: Add module parameter to disable turbo mode 
Signed-off-by: Albert Wang <albert_wang@realtek.com.tw>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 10:59:52 -07:00
Larry Finger
1c9bb32a38 staging: r8712u: Use 802.11bg mode to make a WEP connection 
There are some IOT issues when 802.11bgn mode is used to make a WEP
connection.

Signed-off-by: Albert Wang <albert_wang@realtek.com.tw>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 10:59:52 -07:00
Larry Finger
16e53729b7 staging: r8712u: Fix sparse warnings 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2010-08-31 10:59:52 -07:00
Larry Finger
1407a9e105 staging: r8712u: Fix rate setting when HT is not enabled 
When operating in normal bg mode, the maximum rate was fixed at 48 Mb/s.

Signed-off-by: Albert Wang <albert_wang@realtek.com.tw>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
 2010-08-30 07:51:09 -05:00
Larry Finger
2865d42c78 staging: r8712u: Add the new driver to the mainline kernel 
This code is for a completely new version of the Realtek 8192 USB devices
such as the D-Link DWA-130. The Realtek code, which was originally for
Linux, Windows XP and Windows CE, has been stripped of all code not needed
for Linux. In addition, only one additional configuration variable, which
enables AP mode, remains.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Tested-by: Frederic Leroy <fredo@starox.org>
 2010-08-20 10:15:30 -05:00