Commit Graph

257 Commits

Author SHA1 Message Date
Linus Torvalds
df9b29d13e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
  staging: usbip: bugfix for isochronous packets and optimization
  staging: usbip: bugfix add number of packets for isochronous frames
  staging: usbip: bugfixes related to kthread conversion
  staging: usbip: fix shutdown problems.
  staging: hv: Fix GARP not sent after Quick Migration
  staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
  staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
  staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
  staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
  staging: IIO: IMU: ADIS16400: Add delay after self test
  staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
  staging/rtl81*: build as loadable modules only
  staging: brcm80211: removed 'is_amsdu causing toss' log spam
  staging: brcm80211: fix for 'Short CCK' log spam
  staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
  staging: memrar: remove driver from tree
  staging: sep: remove last memrar remnants
  staging: fix hv_mouse build, needs delay.h
  staging: fix olpc_dcon build errors
  staging: sm7xx: fixed defines
  ...

Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
2011-04-07 11:36:44 -07:00
Randy Dunlap
84ba253b07 staging/rtl81*: build as loadable modules only
These 3 drivers contain much duplicated (triplicated) code, so
building them as built-in results in many errors like:

(.text+0x1b160): multiple definition of `ieee80211_sta_ps_sleep'

Prevent this configuration by making them all buildable only as
loadable modules (similar to the vt665[56] patch last week).

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-04 22:46:15 -07:00
Lucas De Marchi
25985edced Fix common misspellings
Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
2011-03-31 11:26:23 -03:00
Mike McCormack
f0dee9f26c staging: rtl8192e: Don't copy dev pointer to skb
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:48 -07:00
Mike McCormack
83970d9ba1 staging: rtl8192e: Pass priv to cmdpkt functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:48 -07:00
Mike McCormack
ef8efe5b2d staging: rtl8192e: Pass priv to firmware download functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:47 -07:00
Mike McCormack
4368607df1 staging: rtl8192e: Pass priv to rtl8192_interrupt
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:47 -07:00
Mike McCormack
eea7205027 staging: rtl8192e: Pass rtl8192_priv to dm functions
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:47 -07:00
Mike McCormack
1e04ca7adf staging: rtl8192e: Pass ieee80211_device to callbacks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:46 -07:00
Mike McCormack
ad44d2a1c5 staging: rtl8192e: Pass ieee80211_device to callbacks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:46 -07:00
Mike McCormack
7c186cff26 staging: rtl8192e: Pass ieee80211_device to callbacks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:45 -07:00
Mike McCormack
d1c580aa70 staging: rtl8192e: Pass ieee80211_device to callbacks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:45 -07:00
Mike McCormack
09145962d6 staging: rtl8192e: Pass ieee80211_device to callbacks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:45 -07:00
Mike McCormack
45a43a84cd staging: rtl8192e: Simplify rtl819x_ifcheck_resetornot
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:44 -07:00
Mike McCormack
8031aecb2d staging: rtl8192e: Remove ifdefs and dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:44 -07:00
Mike McCormack
de69ba3213 staging: rtl8192e: Pass priv pointer to proc
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:44 -07:00
Mike McCormack
699d015702 staging: rtl8192e: Delete dead code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:43 -07:00
Mike McCormack
db38680061 staging: rtl8192e: Use better loop counter name
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:43 -07:00
Mike McCormack
a78275349c staging: rtl8192e: Delete unused struct members
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:43 -07:00
Mike McCormack
9a77bd58f6 staging: rtl8192e: Store mem_start in priv struct
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:42 -07:00
Mike McCormack
f19dbc0ca8 staging: rtl8192e: Delete commented code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:42 -07:00
Mike McCormack
28344f1a1b staging: rtl8192e: Remove unused header
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 12:24:41 -07:00
Ilia Mirkin
7e901dcd73 staging: rtl8192e: Remove NULL check before kfree
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>
2011-03-14 11:57:34 -07:00
Mike McCormack
1f0e427007 staging: rtl8192e: Pass priv to watch_dog_timer_callback
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:28 -08:00
Mike McCormack
ddd877b2e1 staging: rtl8192e: Pass priv to rtl8192_rx
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:28 -08:00
Mike McCormack
c62fdce2f7 staging: rtl8192e: Pass priv to rtl8192_init
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:28 -08:00
Mike McCormack
679a2494fb staging: rtl8192e: Pass priv to MgntActSet_802_11_PowerSaveMode
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:28 -08:00
Mike McCormack
7703f04daf staging: rtl8192e: Pass priv to rtl8192_tx_resume
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:27 -08:00
Mike McCormack
176e8dc131 staging: rtl8192e: Pass priv to rtl8192_hw_sleep_down
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:27 -08:00
Mike McCormack
95a9a6538c staging: rtl8192e: Pass priv to UpdateRxPktTimeStamp8190
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:27 -08:00
Mike McCormack
043dfdd3c1 staging: rtl8192e: Pass priv to SetKey
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:26 -08:00
Mike McCormack
282fa9f3fb staging: rtl8192e: Pass priv to EnableHWSecurityConfig8192
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:26 -08:00
Mike McCormack
e676ae5886 staging: rtl8192e: Pass priv to IPSEnter
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:26 -08:00
Mike McCormack
58f6b58ee2 staging: rtl8192e: Pass priv to IPSLeave
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:25 -08:00
Mike McCormack
e26174864a staging: rtl8192e: Pass priv to UpdateReceivedRateHistogramStatistics8190
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:25 -08:00
Mike McCormack
9633608f59 staging: rtl8192e: Pass priv to TranslateRxSignalStuff819xpci
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:25 -08:00
Mike McCormack
762bf6dedd staging: rtl8192e: Pass priv to rtl819xE_tx_cmd
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-09 15:46:25 -08:00
Xiaochen Wang
9603ff50b5 staging: rtl8192e use kmemdup and check its return value
use kmemdup instead of kmalloc and memcpy,
and check its return value

Signed-off-by: Xiaochen Wang <wangxiaochen0@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:46:38 -08:00
Mike McCormack
153775d948 staging: rtl8192e: unused Remove dot11PowerSaveMode and RT_PS_MODE
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:46 -08:00
Mike McCormack
73aaa50156 staging: rtl8192e: Move card specific structures out of ieee80211 library header
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:46 -08:00
Mike McCormack
73fdfd7b78 staging: rtl8192e: Delete unused members from struct r8192_priv
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:45 -08:00
Mike McCormack
83969021b2 staging: rtl8192e: Delete non-existing function declarations
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:45 -08:00
Mike McCormack
c9c0a1e7d9 staging: rtl8192e: Delete unused dm_change_dynamic_initgain_thresh
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:45 -08:00
Mike McCormack
262cd81602 staging: rtl8192e: Pass r8192_priv to MgntActSet_RF_State
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:45 -08:00
Mike McCormack
7088dfb698 staging: rtl8192e: Pass r8192_priv around instead of net_device
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:44 -08:00
Mike McCormack
4fc2102522 staging: rtl8192e: Remove redundant function declarations
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:44 -08:00
Mike McCormack
af59c39d5c staging: rtl8192e: Pass r8192_priv around instead of net_device
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:44 -08:00
Mike McCormack
480ab9dccb staging: rtl8192e: Convert more functions to use r8192_priv
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:43 -08:00
Mike McCormack
d9ffa6c2e9 staging: rtl8192e: Pass r8192e_priv to phy functions
Phy functions shouldn't be associated with net_device.

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:43 -08:00
Mike McCormack
5aa68752f9 staging: rtl8192e: Pass r8192_priv to eprom_read
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-07 13:31:43 -08:00