summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8712
Commit message (Collapse)AuthorAgeFilesLines
* staging: r8712u: Fix possible out-of-bounds index with TKIP and AES keysLarry Finger2011-10-111-0/+4
| | | | | | | | | | | Array XGrpKey has only 2 elements and uses (keyid - 1) as the index, which allows the possibility of memory corruption from an out-of-bounds index. This problem was reported by a new version of smatch. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: include module.h where neededStephen Rothwell2011-10-042-0/+2
| | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Most return-values changed from -1 to proper errno macros.Ali Bahar2011-09-073-25/+24Star
| | | | | | | | | | | | | The ioctl handlers were frequently returning -1 upon failure. Most of these have now been changed to proper errno macros. The few remaining ones have been left untouched because either the handler is not called (and so cannot be tested), or the function never fails (and so cannot be system-tested), or requires new code to distinguish its failures. Signed-off-by: Ali Bahar <ali@internetDog.org> Cc: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Tracking kmemleak false positives.Larry Finger2011-09-071-0/+4
| | | | | | | | | | The frame buffers allocated in _r8712_init_recv_priv() are not tracked by kmemleak, but they are freed when the driver is unloaded. To help find any real leaks, these false positives are annotated for kmemleak. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Tx aggregation.Ali Bahar2011-09-074-2/+266
| | | | | | | | | | | | | | Tx Aggregation (CONFIG_R8712_TX_AGGR, known as CONFIG_USB_TX_AGGR in the Realtek tarball) is now added. However, its tests have not been successful! The default in the Realtek tarball is to not build it -- and the Release Notes does not seem to list this as a feature. I have tested the driver with and without this feature; the former does not successfully associate when WPA2 is used. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes.Ali Bahar2011-09-0713-114/+114
| | | | | | | | | | | | | | In r8712_generate_ie(), HT check is no longer done. Removed r8712_add_ht_addt_info(). Changes to defragmentation handling, and queue selection. Get TSSI command. Added an Ad-Hoc check to is_desired_network() r8712_ind_disconnect() now checks for Linked state. r8712_xmit_bh() now schedules an xmit tasklet. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes.Ali Bahar2011-09-074-23/+283
| | | | | | | | | | | | | | | | | | passive_mode added to private ioctls. New private ioctls added for RSSI, link speed, mac address, scan type, and DCE-D. In r8711_wx_get_scan(), we now sleep only 100 times, instead of 1000. In r8711_wx_set_essid(), added a check for Ad-Hoc state. In r8711_wx_get_rate(), added a check for RTL8712_RF_2T2R RF type. Added Set chplan. In r871x_get_wireless_stats(), updated the mechanism for displaying link quality. Added SetDIG and SetRA commands. r8712_joinbss_cmd() no longer checks for Ad-Hoc mode. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). New decl's and defines.Ali Bahar2011-09-073-2/+77
| | | | | | | | | Removed unnecessary casts in kfree calls. A few new types, defines and prototypes. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). tx: NULL _in_ spin lock.Ali Bahar2011-09-074-6/+33
| | | | | | | | | In transmit path, r8712_free_xmitframe(), the pkt pointer is now NULLed _within_ the spin lock. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Rework efuse data handling.Ali Bahar2011-09-071-34/+41
| | | | | | | | Rework efuse data handling. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Tx-code refactoring.Ali Bahar2011-09-073-27/+43
| | | | | | | | Refactor the TX code to prepare for aggregation. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Use stack, not malloc.Ali Bahar2011-09-071-8/+3Star
| | | | | | | | translate_scan() now uses the stack for some variables, instead of mallocing. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). stop_drv_timers moved.Ali Bahar2011-09-073-3/+4
| | | | | | | | stop_drv_timers() is now done in r871xu_dev_remove(), not netdev_close(). Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). No power tracking OID.Ali Bahar2011-09-071-2/+1Star
| | | | | | | | | The call to oid_rt_pro_set_power_tracking_hdl() is no longer available. The function's definition remains, though it is currently unused. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Removed redundant .mem.Ali Bahar2011-09-073-3/+0Star
| | | | | | | | | | recv_frame.mem mp_xmit_frame.mem mp_xmit_packet.mem were not used, and so are now removed. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives.Ali Bahar2011-09-0710-23/+82
| | | | | | | | | | | | These are the new include directives for header files. The following were (somehow!) not explicity in Realtek's, but proved necessary: "linux/usb.h" is needed for usb_alloc_urb(); "linux/interrupt.h" is needed for tasklet_struct. It was often a nested include. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Redundant NULL check.Ali Bahar2011-09-071-1/+1
| | | | | | | | | Removed the redundant NULL check in LedControl871x. As noted by Dan Carpenter, the address of a stack variable is never NULL. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Removed unused MSECS.Ali Bahar2011-09-071-1/+0Star
| | | | | | | | MSECS was never used in this driver. So removed. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Removed _usb_submit_urb.Ali Bahar2011-09-072-4/+3Star
| | | | | | | | Replaced (Realtek's) _usb_submit_urb by (linux's own) usb_submit_urb. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Removed _usb_alloc_urb.Ali Bahar2011-09-074-4/+3Star
| | | | | | | | Replaced (Realtek's) _usb_alloc_urb by (linux's own) usb_alloc_urb. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Removed os_free_netdev.Ali Bahar2011-09-073-7/+2Star
| | | | | | | | Replaced (Realtek's) os_free_netdev by (linux's own) free_netdev. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Renamed _netdev_priv.Ali Bahar2011-09-075-46/+41Star
| | | | | | | | Renamed _netdev_priv to netdev_priv. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners.Ali Bahar2011-09-0722-8/+543
| | | | | | | | Only copyright banners have been added to these files. No functional changes. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: rtl8712: remove r8712_cmd_thread()->daemonize()Oleg Nesterov2011-08-241-1/+0Star
| | | | | | | | | | | | | | | | | | | | | | | | daemonize() is only needed when a user-space task does kernel_thread(). r8712_cmd_thread() is kthread_create()'ed and thus it doesn't need the soon-to-be-deprecated daemonize(). It is the only caller of thread_enter() which actually does the call. Note: - we are going to remove the sigdelset(blocked) code from allow_signal(), this means that without this patch thread_enter() can't work after that. Not to mention daemonize() should be deprecated. - as a side effect, this patch changes ->comm. Hopefully this is fine, and padapter->pnetdev->name probably makes more sense anyway. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Matt Fleming <matt.fleming@intel.com> Acked-by: Tejun Heo <tj@kernel.org> Acked-and-tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* rtl8712: don't just return -EFAULT in wpa_supplicant_ioctl()Dan Carpenter2011-08-241-1/+2
| | | | | | | | | There were some curly braces missing so the original code in wpa_supplicant_ioctl() pretty much always returned -EFAULT without doing anything. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright.Ali Bahar2011-08-2331-0/+186
| | | | | | | | | | Larry Finger's copyright addendum has now been included in the banners. The files involved in this commit have had only their banners changed; there have been no other mods. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners.Ali Bahar2011-08-2350-0/+952
| | | | | | | | The only changes to these files have been the addition of only copyright banners. Signed-off-by: Ali Bahar <ali@internetDog.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Interface-state not fully tracked.Ali Bahar2011-08-231-0/+14
| | | | | | | | | | | | | padapter->bup is True when the interface has been brought Up. But it was not being reset when the interface is taken Down. This has not caused a known problem, as other state variables may be compensating for it. Never the less, it is now properly tracked. Signed-off-by: Ali Bahar <ali@internetDog.org> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: r8712u: Sets to SSID, and to AP MAC#, can now be done when the ↵Ali Bahar2011-08-232-4/+26
| | | | | | | | | | | | | | | | | | interface is Down. The original Realtek code assumed that ioctl Sets get done after the interface is Up. This included the set to Essid and to the AP MAC#; and it fit Realtek's installation procedure. But there is no such necessity for the adapter, and no stated requirement found elsewhere. Also, wireless drivers typically permit this. A typical error message used to be: Error for wireless request "Set ESSID" (8B1A) : SET failed on device wlan0 ; Operation not permitted. Signed-off-by: Ali Bahar <ali@internetDog.org> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge branch 'staging-next' of ↵Linus Torvalds2011-07-264-24/+22Star
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits) staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. staging:iio:kfifo_buf fix double initialization of the ring device structure. staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata. staging:iio:imu fix missing register table index for some channels spectra: enable device before poking it staging: rts_pstor: Fix a miswriting staging/lirc_bt829: Return -ENODEV when no hardware is found. staging/lirc_parallel: remove pointless prototypes. staging/lirc_parallel: fix panic on rmmod staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata. Staging: zram: Fix kunmapping order Revert "gma500: Fix dependencies" gma500: Add medfield header gma500: wire up the mrst i2c bus from chip_info gma500: Fix DPU build gma500: Clean up the DPU config and make it runtime gma500: resync with Medfield progress gma500: Use the mrst helpers and power control for mode commit gma500@ Fix backlight range error gma500: More Moorestown muddle meddling means MM maybe might modeset ... Fix up fairly trivial conflicts all over, mostly due to header file cleanup conflicts, but some deleted files and some just context changes: - Documentation/feature-removal-schedule.txt - drivers/staging/bcm/headers.h - drivers/staging/brcm80211/brcmfmac/dhd_linux.c - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h - drivers/staging/brcm80211/brcmfmac/wl_iw.c - drivers/staging/et131x/et131x_netdev.c - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c - drivers/staging/rtl8192e/r8192E.h - drivers/staging/usbip/userspace/src/utils.h
| * Remove unneeded version.h includes from drivers/staging/rtl*/Jesper Juhl2011-07-051-2/+0Star
| | | | | | | | | | | | | | | | | | | | | | It was pointed out by 'make versioncheck' that some includes of linux/version.h are not needed in drivers/staging/rtl8187se/, drivers/staging/rtl8192e/, drivers/staging/rtl8192u/ & drivers/staging/rtl8712/. This patch removes them. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: rtl8712: Add missing whitespace in struct definitionMichael Fiedler2011-07-051-1/+1
| | | | | | | | | | | | | | | | Fixes scripts/checkpatch.pl warning. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: rtl8712: Use linux/atomic.h instead of asm/atomic.hMichael Fiedler2011-07-051-1/+1
| | | | | | | | | | | | | | | | Fixes warning from scripts/checkpatch.pl. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: rtl8712: Use __packed instead of __attribute__ ((packed))Michael Fiedler2011-07-052-18/+20
| | | | | | | | | | | | | | | | | | According to scripts/checkpatch.pl, the __packed macro from linux/compiler.h should be used. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: rtl8712: Remove duplicate #define for __attribute__ ((packed))Michael Fiedler2011-07-051-2/+0Star
| | | | | | | | | | | | | | | | There is already a macro defined in linux/compiler.h. Signed-off-by: Michael Fiedler <michael.fiedler@informatik.stud.uni-erlangen.de> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | treewide: remove duplicate includesVitaliy Ivanov2011-06-202-2/+0Star
|/ | | | | | | | Many stupid corrections of duplicated includes based on the output of scripts/checkincludes.pl. Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* staging: r8712u: Fix driver to support ad-hoc modeJeff Chua2011-05-031-1/+4
| | | | | | | | | | | | | | | Driver r8712u is unable to handle ad-hoc mode. The issue is that when the driver first starts, there will not be an SSID for association. The fix is to always call the "select and join from scan" routine when in ad-hoc mode. Note: Ad-hoc mode worked intermittently before. If the driver had previously been associated, then things were OK. Signed-off-by: Jeff Chua <jeff.chua.linux@gmail.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: Remove unnecessary semicolons when while (foo) {...};Joe Perches2011-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done via perl script: $ cat remove_semi_while.pl my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/; my $match_balanced_braces = qr/(\{(?:[^\{\}]++|(?-1))*\})/; foreach my $file (@ARGV) { my $f; my $text; my $oldtext; next if ((-d $file)); open($f, '<', $file) or die "$P: Can't open $file for read\n"; $oldtext = do { local($/) ; <$f> }; close($f); next if ($oldtext eq ""); $text = $oldtext; my $count = 0; do { $count = 0; $count += $text =~ s@\b(while\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx; } while ($count > 0); if ($text ne $oldtext) { my $newfile = $file; open($f, '>', $newfile) or die "$P: Can't open $newfile for write\n"; print $f $text; close($f); } } $ One false positive removed. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: rtl8712: fixed coding style issuesJavier M. Mellid2011-04-206-14/+21
| | | | | | | Fixed some style and format issues with code. Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: rtl8712: fixed coding style issuesJavier M. Mellid2011-04-2020-306/+306
| | | | | | | Fixed some style and format issues with headers. Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: rtl8712: redundant null check before kfree()Alexander Beregalov2011-04-205-12/+6Star
| | | | | Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Fix common misspellingsLucas De Marchi2011-03-316-9/+9
| | | | | | Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
* staging: rtl8712: Remove NULL check before kfreeIlia Mirkin2011-03-141-2/+1Star
| | | | | | | | | | | | | | | | | This patch was generated by the following semantic patch: // <smpl> @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // </smpl> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: rtl8712: check _malloc return valueXiaochen Wang2011-03-071-1/+1
| | | | | | | | Description: The original check is wrong. Signed-off-by: Xiaochen Wang <wangxiaochen0@gmail.com> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: rtl8712: check copy_from_user return valueXiaochen Wang2011-03-071-2/+2
| | | | | | | | Description:return -EFAULT if copy_to_user() fails Signed-off-by: Xiaochen Wang <wangxiaochen0@gmail.com> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: rtl8712: rtl871x_pwrctrl.c remove one to many l's in the word.Justin P. Mattock2011-03-011-1/+1
| | | | | | | The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: rtl8712: fix math errors in snprintf()Dan Carpenter2011-02-091-9/+13
| | | | | | | | | | | | | The original code had calls to snprintf(p, 7, "wpa_ie=") but that string is 8 characters (because snprintf() puts a NUL terminator on the end). So instead of an '=' the what gets written to buf is a NUL terminator followed by the rest of the string. And actually the %02x formats are three chars as well when you include the terminator. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Merge branch 'staging-next' into 2.6.38-rc3Greg Kroah-Hartman2011-02-022-36/+120
|\ | | | | | | | | | | | | | | | | This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: r8712u: Add new device IDsAxel Köllhofer2011-01-241-32/+113
| | | | | | | | | | | | | | | | | | | | | | This patch adds several new device ids to the r8712u staging driver. The new ids were retrieved from latest vendor driver (v2.6.6.0.20101111) downloadable from www.realtek.com.tw Signed-off-by: Axel Koellhofer <AxelKoellhofer@web.de> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@kernel.org> [2.6.37] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: r8712u: Fix memory leak in firmware loadingLarry Finger2011-01-201-4/+7
| | | | | | | | | | | | | | The error path leaks the firmware struct. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>