Commit Graph

263432 Commits

Author SHA1 Message Date
Larry Finger
ce403a6ac4 staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG_CRDA
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:14:32 -05:00
Larry Finger
d32ddcba9d staging: rtl8192e: Remove dead code associated with FOR_ANDROID_X86 and FOR_MOBLIN
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:07:19 -05:00
Larry Finger
eccf634fc8 staging: rtl8192e: Remove dead code associated with WMM_Hang_8187
This patch also removes an "#if 1 .... #endif" that survived an earlier
edit.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 21:06:22 -05:00
Larry Finger
eae78ca689 staging: rtl8192e: Remove dead code associated with BUILT_IN_MSHCLASS
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:56:31 -05:00
Larry Finger
07f432338a staging: rtl8192e: Remove dead code associated with ADHOC_11N
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:56:14 -05:00
Larry Finger
f1c2256769 staging: rtl8192e: Remove dead code associated with WIFI_TEST
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:55:56 -05:00
Larry Finger
e11fd51324 staging: rtl8192e: Remove dead code associated with NOT_YET
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:55:36 -05:00
Larry Finger
6e2c538f8f staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:55:15 -05:00
Larry Finger
bfb74db3e5 staging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:51:38 -05:00
Larry Finger
0252596966 staging: rtl8192e: Remove dead code associated with SUPPORT_USPD
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:51:18 -05:00
Larry Finger
94114a5ad7 staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:50:22 -05:00
Larry Finger
bf474281e9 staging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:38:40 -05:00
Larry Finger
68aee8036c staging: rtl8192e: Remove code dependent of JOHN_DUMP
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:38:21 -05:00
Larry Finger
2b259bd38f staging: rtl8192e: Remove ifdefs that depend on ENABLE_DOT11D
This configuration parameter is selected in the Makefile, thus the
conditional code can be removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:33:14 -05:00
Larry Finger
5b774ec296 staging: rtl8192e: Remove references to ENABLE_GPIO_RADIO_CTL
This configuration variable is set in the make file.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:25:56 -05:00
Larry Finger
e755463c21 staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:25:38 -05:00
Larry Finger
0e3b183059 staging: rtl8192e: Remove dead code associated with PF_SYNCTHREAD
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:25:15 -05:00
Larry Finger
4ebba6d6e3 staging: rtl8192e: Remove dead code associated with COMPATIBLE_WITH_RALINK_MESH
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:24:57 -05:00
Larry Finger
2e94b0bbbc staging: rtl8192e: Remove dead code associated with CONFIG_ASPM_OR_D3
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:24:18 -05:00
Larry Finger
a97dc3afc0 staging: rtl8192e: Remove dead code associated with USB_USE_ALIGNMENT
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:23:59 -05:00
Larry Finger
d064307a1a staging: rtl8192e: Remove dead code involved with TO_DO
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:23:39 -05:00
Larry Finger
15e7650e88 staging: rtl8192e: Remove dead code involved with TO_DO_LIST
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:23:17 -05:00
Larry Finger
34a7eb3db2 staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO'
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:22:55 -05:00
Larry Finger
6e1acf20a7 staging: rtl8192e: Remove dead code associated with CONFIG_MP
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:22:34 -05:00
Larry Finger
82a7fc6d4c staging: rtl8192e: Fix kernel panics due to RX skb allocation failures
This driver uses RX skb's of O(2), thus it is possible for memory fragmentation
to prevent the allocation of a new one to replace a newly-received buffer.
When such a failure occurs, the kernel panics.

The fix is to drop an incoming packet whenever such an allocation fails. This
fix matches the one done in rtlwifi for other Realtek PCI devices.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:22:14 -05:00
Larry Finger
b1d5ee7004 staging: rtl8192e: Fix edit error in removal of dead code associated with RTL8190P
One too many lines were removed in an earlier patch. Rather than resubmit
as a V2, this line is added back here.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:15:54 -05:00
Larry Finger
f8f3b8a585 staging: rtl8192e: Remove internal references to RTL8192E
Now that the code can only generate a driver for RTL8192E, the internal
ifdef's are no longer needed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:14:57 -05:00
Larry Finger
eb37802599 staging: rtl8192e: Remove dead code associated with RTL8192U
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:14:06 -05:00
Larry Finger
8df91dae5d staging: rtl8192e: Remove dead code associated with RTL8192SU
The vendor code will generate several different drivers.  Eliminate
code used to generate code for the RTL8192SU devices.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:13:45 -05:00
Larry Finger
b355c1d0bc staging: rtl8192e: Remove dead code associated with RTL8192CE
The vendor code will generate several different drivers. As the RTL8192CE
is covered by a mac80211 driver in mainline, eliminate that code here.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:12:53 -05:00
Larry Finger
1e71e6d0cf staging: rtl8192e: Remove dead code associated with RTL8192SE
The vendor code will generate several different drivers. As the RTL8192SE
is covered by a mac80211 driver in mainline, eliminate that code heere.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:11:59 -05:00
Larry Finger
175159c537 staging: rtl8192e: Remove code dependent on RTL8190P
The vendor code can conditionally generate drivers for a number of
devices. Remove any code that depends on RTL8190P being set.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-23 20:11:04 -05:00
Mike McCormack
d6f2deb346 rtl8192e: Add a TODO
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 20:04:16 -05:00
Mike McCormack
2246698303 rtl8192e: Remove unused debug code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 20:04:08 -05:00
Mike McCormack
4f6807e8d2 rtl8192e: Remove occurences of #if 1
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 20:03:54 -05:00
Mike McCormack
3591733d28 rtl8192e: Remove WIRELESS_EXT macro checks
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 20:03:45 -05:00
Mike McCormack
5ad60c9794 rtl8192e: Remove CONFIG_RTL8192_IO_MAP
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 20:03:36 -05:00
Mike McCormack
cb76215448 rtl8192e: Remove extra ifdefs
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 20:02:27 -05:00
Mike McCormack
1ec3e2f255 rtl8192e: reject rtl8192se cards with same PCI ID
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
2011-08-23 19:02:07 -05:00
Larry Finger
94a799425e From: wlanfae <wlanfae@realtek.com>
[PATCH 1/8] rtl8192e: Import new version of driver from realtek

Signed-off-by: wlanfae <wlanfae@realtek.com>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
2011-08-23 19:00:42 -05:00
Larry Finger
8cfcabf80c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-08-23 17:19:00 -05:00
Linus Torvalds
fcb8ce5cfe Linux 3.1-rc3 2011-08-22 11:42:53 -07:00
Linus Torvalds
8f6544edb2 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Add group event scheduling option to perf record/stat
  MAINTAINERS: Fix list of perf events source files
  perf tools: Fix build against newer glibc
  perf tools: Fix error handling of unknown events
  perf evlist: Fix missing event name init for default event
  perf list: Fix exit value
2011-08-22 11:26:56 -07:00
Linus Torvalds
4762e252f4 Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/tracing: Fix tracing config option properly
  xen: Do not enable PV IPIs when vector callback not present
  xen/x86: replace order-based range checking of M2P table by linear one
  xen: xen-selfballoon.c needs more header files
2011-08-22 11:25:44 -07:00
Jeremy Fitzhardinge
60c5f08e15 xen/tracing: Fix tracing config option properly
Steven Rostedt says we should use CONFIG_EVENT_TRACING.

Cc:Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
2011-08-22 11:28:33 -04:00
Stefano Stabellini
3c05c4bed4 xen: Do not enable PV IPIs when vector callback not present
Fix regression for HVM case on older (<4.1.1) hypervisors caused by

  commit 99bbb3a84a
  Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
  Date:   Thu Dec 2 17:55:10 2010 +0000

    xen: PV on HVM: support PV spinlocks and IPIs

This change replaced the SMP operations with event based handlers without
taking into account that this only works when the hypervisor supports
callback vectors. This causes unexplainable hangs early on boot for
HVM guests with more than one CPU.

BugLink: http://bugs.launchpad.net/bugs/791850

CC: stable@kernel.org
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Tested-and-Reported-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
2011-08-22 11:28:09 -04:00
Linus Torvalds
3210d190dc Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: core: handle ack_busy when fetching the Config ROM
2011-08-21 18:13:19 -07:00
Josef Bacik
6719db6a23 Btrfs: fix 64 bit divide problem
This fixes a regression introduced by commit cdcb725c05 ("Btrfs: check
if there is enough space for balancing smarter").  We can't do 64-bit
divides on 32-bit architectures.

In cases where we need to divide/multiply by 2 we should just left/right
shift respectively, and in cases where theres N number of devices use
do_div.  Also make the counters u64 to match up with rw_devices.
Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
Acked-and-tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-08-21 07:02:00 -07:00
Linus Torvalds
c063d8a60f Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: flush any pending end_io requests before DIO reads w/dioread_nolock
  ext4: fix nomblk_io_submit option so it correctly converts uninit blocks
  ext4: Resolve the hang of direct i/o read in handling EXT4_IO_END_UNWRITTEN.
  ext4: call ext4_ioend_wait and ext4_flush_completed_IO in ext4_evict_inode
  ext4: Fix ext4_should_writeback_data() for no-journal mode
2011-08-21 06:59:41 -07:00
Linus Torvalds
79058c4b9e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
  ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
  ALSA: hda - Don't spew too many ELD errors
  ALSA: usb-audio - Fix missing mixer dB information
  ALSA: hda - Add "PCM" volume to vmaster slave list
  ALSA: hda - Fix duplicated capture-volume creation for ALC268 models
  ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
  ALSA: snd_usb_caiaq: track submitted output urbs
2011-08-21 06:59:02 -07:00