Commits · f1c22567693a8c01a0bda0e3e29243eff3e5f196 · Kirill Smelkov / linux

24 Aug, 2011 35 commits
- staging: rtl8192e: Remove dead code associated with WIFI_TEST · f1c22567
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  f1c22567
- staging: rtl8192e: Remove dead code associated with NOT_YET · e11fd513
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  e11fd513
- staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM · 6e2c538f
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  6e2c538f
- staging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT · bfb74db3
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  bfb74db3
- staging: rtl8192e: Remove dead code associated with SUPPORT_USPD · 02525969
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  02525969
- staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX · 94114a5a
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  94114a5a
- staging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE · bf474281
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  bf474281
- staging: rtl8192e: Remove code dependent of JOHN_DUMP · 68aee803
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  68aee803
- staging: rtl8192e: Remove ifdefs that depend on ENABLE_DOT11D · 2b259bd3
  Larry Finger authored Jul 13, 2011
```
This configuration parameter is selected in the Makefile, thus the
conditional code can be removed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  2b259bd3
- staging: rtl8192e: Remove references to ENABLE_GPIO_RADIO_CTL · 5b774ec2
  Larry Finger authored Jul 13, 2011
```
This configuration variable is set in the make file.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  5b774ec2
- staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N · e755463c
  Larry Finger authored Jul 13, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  e755463c
- staging: rtl8192e: Remove dead code associated with PF_SYNCTHREAD · 0e3b1830
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  0e3b1830
- staging: rtl8192e: Remove dead code associated with COMPATIBLE_WITH_RALINK_MESH · 4ebba6d6
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  4ebba6d6
- staging: rtl8192e: Remove dead code associated with CONFIG_ASPM_OR_D3 · 2e94b0bb
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  2e94b0bb
- staging: rtl8192e: Remove dead code associated with USB_USE_ALIGNMENT · a97dc3af
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  a97dc3af
- staging: rtl8192e: Remove dead code involved with TO_DO · d064307a
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  d064307a
- staging: rtl8192e: Remove dead code involved with TO_DO_LIST · 15e7650e
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  15e7650e
- staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO' · 34a7eb3d
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  34a7eb3d
- staging: rtl8192e: Remove dead code associated with CONFIG_MP · 6e1acf20
  Larry Finger authored Jul 12, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  6e1acf20
- staging: rtl8192e: Fix kernel panics due to RX skb allocation failures · 82a7fc6d
  Larry Finger authored Jul 13, 2011
```
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>
```
  82a7fc6d
- staging: rtl8192e: Fix edit error in removal of dead code associated with RTL8190P · b1d5ee70
  Larry Finger authored Jul 13, 2011
```
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>
```
  b1d5ee70
- staging: rtl8192e: Remove internal references to RTL8192E · f8f3b8a5
  Larry Finger authored Jul 12, 2011
```
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>
```
  f8f3b8a5
- staging: rtl8192e: Remove dead code associated with RTL8192U · eb378025
  Larry Finger authored Jul 11, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
```
  eb378025
- staging: rtl8192e: Remove dead code associated with RTL8192SU · 8df91dae
  Larry Finger authored Jul 11, 2011
```
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>
```
  8df91dae
- staging: rtl8192e: Remove dead code associated with RTL8192CE · b355c1d0
  Larry Finger authored Jul 11, 2011
```
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>
```
  b355c1d0
- staging: rtl8192e: Remove dead code associated with RTL8192SE · 1e71e6d0
  Larry Finger authored Jul 11, 2011
```
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>
```
  1e71e6d0
- staging: rtl8192e: Remove code dependent on RTL8190P · 175159c5
  Larry Finger authored Jul 11, 2011
```
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>
```
  175159c5
- rtl8192e: Add a TODO · d6f2deb3
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  d6f2deb3
- rtl8192e: Remove unused debug code · 22466983
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  22466983
- rtl8192e: Remove occurences of #if 1 · 4f6807e8
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  4f6807e8
- rtl8192e: Remove WIRELESS_EXT macro checks · 3591733d
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  3591733d
- rtl8192e: Remove CONFIG_RTL8192_IO_MAP · 5ad60c97
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  5ad60c97
- rtl8192e: Remove extra ifdefs · cb762154
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  cb762154
- rtl8192e: reject rtl8192se cards with same PCI ID · 1ec3e2f2
  Mike McCormack authored Jul 11, 2011
```
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
```
  1ec3e2f2
- From: wlanfae <wlanfae@realtek.com> · 94a79942
  Larry Finger authored Aug 23, 2011
```
[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>
---
```
  94a79942
23 Aug, 2011 1 commit
- Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 8cfcabf8
  Larry Finger authored Aug 23, 2011
  
  8cfcabf8
22 Aug, 2011 4 commits

Linux 3.1-rc3 · fcb8ce5c
Linus Torvalds authored Aug 22, 2011

fcb8ce5c

Merge branch 'perf-urgent-for-linus' of... · 8f6544ed

Linus Torvalds authored Aug 22, 2011

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

8f6544ed

Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 4762e252

Linus Torvalds authored Aug 22, 2011

* '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

4762e252

xen/tracing: Fix tracing config option properly · 60c5f08e

Jeremy Fitzhardinge authored Aug 11, 2011

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>

60c5f08e