Linux 3.6.5
Greg KH
maintainerI'm announcing the release of the 3.6.5 kernel.
All users of the 3.6 kernel series must upgrade.
The updated 3.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.6.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/arm/atmel-at91.txt | 2 Makefile | 2 arch/arm/kernel/smp.c | 14 + arch/arm/mach-at91/at91rm9200_devices.c | 2 arch/arm/mach-at91/at91sam9260_devices.c | 2 arch/arm/mach-at91/at91sam9261_devices.c | 2 arch/arm/mach-at91/at91sam9263_devices.c | 2 arch/arm/mach-at91/at91sam9rl_devices.c | 2 arch/arm/mach-at91/board-neocore926.c | 2 arch/arm/mach-at91/board-sam9261ek.c | 2 arch/arm/mach-at91/board-sam9263ek.c | 2 arch/arm/mach-at91/generic.h | 3 arch/arm/mach-at91/irq.c | 9 arch/arm/mach-at91/setup.c | 4 arch/arm/mach-exynos/common.c | 5 arch/arm/mach-s3c24xx/s3c2416.c | 2 arch/arm/mach-s3c24xx/s3c2443.c | 4 arch/arm/mach-s5p64x0/common.c | 3 arch/arm/mach-s5pc100/common.c | 3 arch/arm/mach-s5pv210/common.c | 3 arch/arm/plat-samsung/include/plat/spi-core.h | 30 +++ arch/x86/include/asm/efi.h | 1 arch/x86/kernel/e820.c | 3 arch/x86/kernel/setup.c | 27 ++ arch/x86/mm/init.c | 58 +++--- arch/x86/mm/init_64.c | 7 arch/x86/platform/efi/efi.c | 43 ++-- drivers/bcma/main.c | 5 drivers/cpufreq/powernow-k8.c | 9 drivers/dma/imx-dma.c | 4 drivers/dma/sirf-dma.c | 4 drivers/extcon/extcon_class.c | 7 drivers/gpu/drm/radeon/evergreen_cs.c | 1 drivers/hv/channel.c | 24 +- drivers/net/ethernet/tile/tilegx.c | 35 +-- drivers/net/usb/cdc_ether.c | 41 ++-- drivers/net/usb/qmi_wwan.c | 14 + drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 ++++++++--------- drivers/net/wireless/b43/main.c | 4 drivers/net/wireless/ipw2x00/ipw2200.c | 2 drivers/net/wireless/iwlwifi/dvm/devices.c | 39 ++-- drivers/rtc/rtc-imxdi.c | 2 drivers/staging/android/binder.c | 30 ++- drivers/staging/comedi/drivers/amplc_dio200.c | 2 drivers/staging/comedi/drivers/amplc_pc236.c | 6 drivers/staging/comedi/drivers/amplc_pc263.c | 3 drivers/staging/comedi/drivers/das08.c | 2 drivers/staging/comedi/drivers/ni_daq_700.c | 2 drivers/staging/comedi/drivers/ni_labpc.c | 2 drivers/staging/zram/zram_drv.c | 12 + drivers/usb/core/hub.c | 7 drivers/usb/host/pci-quirks.c | 9 drivers/usb/host/xhci-ring.c | 11 + drivers/usb/host/xhci.c | 4 drivers/usb/serial/ch341.c | 23 +- drivers/usb/serial/digi_acceleport.c | 117 ++++++------ drivers/usb/serial/ipw.c | 7 drivers/usb/serial/keyspan.c | 183 +++++++++---------- drivers/usb/serial/keyspan.h | 8 drivers/usb/serial/mct_u232.c | 59 +++--- drivers/usb/serial/metro-usb.c | 65 +----- drivers/usb/serial/mos7720.c | 62 +++--- drivers/usb/serial/mos7840.c | 30 --- drivers/usb/serial/omninet.c | 36 +-- drivers/usb/serial/opticon.c | 11 - drivers/usb/serial/option.c | 23 ++ drivers/usb/serial/qcserial.c | 33 +-- drivers/usb/serial/quatech2.c | 135 ++++++-------- drivers/usb/serial/sierra.c | 133 +++++++------ drivers/usb/serial/usb-wwan.h | 2 drivers/usb/serial/usb_wwan.c | 130 +++++-------- drivers/usb/serial/whiteheat.c | 60 ++---- drivers/usb/storage/unusual_devs.h | 6 drivers/vhost/net.c | 3 fs/compat_ioctl.c | 2 fs/exec.c | 3 fs/lockd/mon.c | 57 +++-- fs/namei.c | 4 fs/nfs/blocklayout/blocklayout.c | 93 +++++++-- fs/sysfs/dir.c | 16 - include/drm/drm_pciids.h | 3 include/linux/efi.h | 5 include/linux/memblock.h | 1 include/net/cfg80211.h | 1 init/main.c | 3 lib/genalloc.c | 2 mm/memblock.c | 24 ++ mm/rmap.c | 20 +- net/bluetooth/smp.c | 6 net/mac80211/iface.c | 2 net/mac80211/mlme.c | 35 ++- net/mac80211/sta_info.c | 4 net/mac80211/util.c | 4 net/mac80211/wpa.c | 3 net/sunrpc/xprtsock.c | 41 +--- net/wireless/mlme.c | 12 - sound/pci/hda/patch_realtek.c | 20 +- usr/gen_init_cpio.c | 43 ++-- 98 files changed, 1254 insertions(+), 960 deletions(-)
Alex Deucher (2):
drm/radeon: add some new SI PCI ids drm/radeon: add error output if VM CS fails on cayman
Andreas Herrmann (1):
cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
Anisse Astier (2):
ehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions
ehci: Add yet-another Lucid nohandoff pci quirk
Arve Hjønnevåg (2):
Staging: android: binder: Fix memory leak on thread/process exit
Staging: android: binder: Allow using highmem for binder buffers
Barry Song (2):
dmaengine: sirf: fix a typo in dma_prep_interleaved
dmaengine: sirf: fix a typo in moving running dma_desc to active queue
Bo Shen (1):
ARM: at91/i2c: change id to let i2c-gpio work
Chris Metcalf (1):
tilegx: fix some issues in the SW TSO support
Dan Williams (1):
qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan
Dave Young (1):
Revert "x86/mm: Fix the size calculation of mapping tables"
Felix Fietkau (2):
mac80211: use ieee80211_free_txskb in a few more places Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"
Fred Brooks (1):
staging: comedi: ni_daq_700: fix dio subdevice regression
Geert Uytterhoeven (1):
sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
Greg Kroah-Hartman (1):
Linux 3.6.5
Heiko Stuebner (1):
ARM: SAMSUNG: Add naming of s3c64xx-spi devices
Ian Abbott (6):
staging: comedi: das08: fix possible NULL deref during detach
staging: comedi: ni_labpc: fix possible NULL deref during detach
staging: comedi: amplc_dio200: fix possible NULL deref during detach
staging: comedi: amplc_pc263: fix possible NULL deref during detach
staging: comedi: amplc_pc236: fix invalid register access during detach
staging: comedi: amplc_pc236: fix possible NULL deref during detach
Ivan Shugov (1):
ARM: at91: at91sam9g10: fix SOC type detection
Jacob Shin (1):
x86, mm: Find_early_table_space based on ranges that are actually being mapped
Jan Beulich (1):
x86-64: Fix page table accounting
Jan Kara (1):
mm: fix XFS oops due to dirty pages without buffers on s390
Jan Luebbe (1):
drivers/rtc/rtc-imxdi.c: add missing spin lock initialization
Johan Hedberg (1):
Bluetooth: SMP: Fix setting unknown auth_req bits
Johan Hovold (28):
USB: usb-wwan: fix multiple memory leaks in error paths
USB: ch341: fix port-data memory leak
USB: digi_acceleport: fix port-data memory leak
USB: ipw: fix interface-data memory leak in error path
USB: mct_u232: fix port-data memory leak
USB: mct_u232: fix broken close
USB: option: fix interface-data memory leak in error path
USB: keyspan: fix NULL-pointer dereferences and memory leaks
USB: omninet: fix port-data memory leak
USB: qcserial: fix interface-data memory leak in error path
USB: whiteheat: fix memory leak in error path
USB: whiteheat: fix port-data memory leak
USB: opticon: fix DMA from stack
USB: opticon: fix memory leak in error path
USB: metro-usb: fix port-data memory leak
USB: metro-usb: fix io after disconnect
USB: mos7720: fix port-data memory leak
USB: quatech2: fix memory leak in error path
USB: quatech2: fix port-data memory leaks
USB: quatech2: fix close and disconnect urb handling
USB: quatech2: fix io after disconnect
USB: sierra: fix memory leak in attach error path
USB: sierra: fix memory leak in probe error path
USB: sierra: fix port-data memory leak
USB: mos7840: fix urb leak at release
USB: mos7840: fix port-device leak in error path
USB: mos7840: remove NULL-urb submission
USB: mos7840: remove invalid disconnect handling
Johannes Berg (2):
mac80211: connect with HT20 if HT40 is not permitted
iwlwifi: fix 6000 series channel switch command
Josh Triplett (1):
efi: Defer freeing boot services memory until after ACPI init
Josh Wu (1):
ARM: at91/tc: fix typo in the DT document
K. Y. Srinivasan (1):
Drivers: hv: Cleanup error handling in vmbus_open()
Kees Cook (2):
gen_init_cpio: avoid stack overflow when expanding fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
Larry Finger (1):
b43: Fix oops on unload when firmware not found
Lennart Sorensen (1):
USB: serial: Fix memory leak in sierra_release()
Linus Torvalds (1):
VFS: don't do protected {sym,hard}links by default
Michael S. Tsirkin (1):
vhost: fix mergeable bufs on BE hosts
Michael Shigorin (1):
usb-storage: add unusual_devs entry for Casio EX-N1 digital camera
Nicolas Ferre (2):
ARM: at91: fix external interrupts in non-DT case
ARM: at91: fix external interrupt specification in board code
Nitin Gupta (1):
staging: zram: Fix handling of incompressible pages
Octavian Purdila (1):
usb hub: send clear_tt_buffer_complete events when canceling TT clear work
Oleg Nesterov (1):
freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD
Oliver Neukum (2):
xhci: fix integer overflow
xhci: endianness xhci_calculate_intel_u2_timeout
Olof Johansson (1):
x86: efi: Turn off efi_enabled after setup on mixed fw/kernel
Peng Tao (2):
pnfsblock: fix non-aligned DIO read
pnfsblock: fix non-aligned DIO write
Peter Huewe (2):
extcon: Unregister compat class at module unload to fix oops
extcon: unregister compat link on cleanup
Piotr Haber (1):
bcma: fix unregistration of cores
Sarah Sharp (1):
xhci: Fix potential NULL ptr deref in command cancellation.
Stanislav Yakovlev (1):
net/wireless: ipw2200: Fix panic occurring in ipw_handle_promiscuous_tx()
Stanislaw Gruszka (2):
mac80211: check if key has TKIP type before updating IV cfg80211/mac80211: avoid state mishmash on deauth
Stefán Freyr (1):
ALSA: hda - add dock support for Thinkpad T430
Takashi Iwai (1):
ALSA: hda - Fix silent headphone output from Toshiba P200
Thadeu Lima de Souza Cascardo (1):
genalloc: stop crashing the system when destroying a pool
Trond Myklebust (6):
SUNRPC: Get rid of the xs_error_report socket callback
SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
LOCKD: fix races in nsm_client_get
SUNRPC: Prevent races in xs_abort_connection()
LOCKD: Clear ln->nsm_clnt only when ln->nsm_users is zero
Wei Yongjun (1):
dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
Will Deacon (1):
ARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count
Yinghai Lu (3):
x86, mm: Trim memory in memblock to be page aligned x86, mm: Undo incorrect revert in arch/x86/mm/init.c x86, mm: Use memblock memory loop instead of e820_RAM
Greg KH
maintainerDocumentation/devicetree/bindings/arm/atmel-at91.txt +1 -1
@@ -8,7 +8,7 @@ PIT Timer required properties: shared across all System Controller members. TC/TCLIB Timer required properties: -- compatible: Should be "atmel,<chip>-pit". +- compatible: Should be "atmel,<chip>-tcb". <chip> can be "at91rm9200" or "at91sam9x5" - reg: Should contain registers location and length - interrupts: Should contain all interrupts for the TC block
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 6 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Terrified Chipmunk
arch/arm/kernel/smp.c +10 -4
@@ -222,18 +222,24 @@ static void percpu_timer_setup(void); asmlinkage void __cpuinit secondary_start_kernel(void) {struct mm_struct *mm = &init_mm; -unsigned int cpu =smp_processor_id (); +unsigned int cpu; + +/* +* The identity mapping is uncached (strongly ordered), so +* switch away from it before attempting any exclusive accesses. +*/ +cpu_switch_mm (mm->pgd, mm); +enter_lazy_tlb (mm, current); +local_flush_tlb_all ();/* * All kernel threads share the same mm context; grab a * reference and switch to it. */ + cpu =smp_processor_id ();atomic_inc (&mm->mm_count); current->active_mm = mm;cpumask_set_cpu (cpu,mm_cpumask (mm)); -cpu_switch_mm (mm->pgd, mm); -enter_lazy_tlb (mm, current); -local_flush_tlb_all ();printk ("CPU%u: Booted secondary processor\n" , cpu);
arch/arm/mach-at91/at91rm9200_devices.c +1 -1
@@ -463,7 +463,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91rm9200_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9260_devices.c +1 -1
@@ -471,7 +471,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9260_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9261_devices.c +1 -1
@@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9261_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9263_devices.c +1 -1
@@ -542,7 +542,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9263_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9rl_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/board-neocore926.c +1 -1
@@ -129,7 +129,7 @@ static struct spi_board_info neocore926_spi_devices[] = { .max_speed_hz = 125000 * 16, .bus_num = 0, .platform_data = &ads_info, - .irq = AT91SAM9263_ID_IRQ1, + .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1, },#endif };
arch/arm/mach-at91/board-sam9261ek.c +1 -1
@@ -309,7 +309,7 @@ static struct spi_board_info ek_spi_devices[] = { .max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */ .bus_num = 0, .platform_data = &ads_info, - .irq = AT91SAM9261_ID_IRQ0, + .irq = NR_IRQS_LEGACY + AT91SAM9261_ID_IRQ0, .controller_data = (void *) AT91_PIN_PA28, /* CS pin */ },#endif
arch/arm/mach-at91/board-sam9263ek.c +1 -1
@@ -132,7 +132,7 @@ static struct spi_board_info ek_spi_devices[] = { .max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */ .bus_num = 0, .platform_data = &ads_info, - .irq = AT91SAM9263_ID_IRQ1, + .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1, },#endif };
arch/arm/mach-at91/generic.h +2 -1
@@ -26,7 +26,8 @@ extern void __init at91_dt_initialize(void);extern void __init at91_init_irq_default (void );extern void __init at91_init_interrupts (unsigned int priority[]);extern void __init at91x40_init_interrupts (unsigned int priority[]); -extern void __init at91_aic_init (unsigned int priority[]); +extern void __init at91_aic_init (unsigned int priority[], +unsigned int ext_irq_mask);extern int __init at91_aic_of_init (struct device_node *node,struct device_node *parent); extern int __init at91_aic5_of_init(struct device_node *node,
arch/arm/mach-at91/irq.c +7 -2
@@ -502,14 +502,19 @@ int __init at91_aic5_of_init(struct device_node *node,/* * Initialize the AIC interrupt controller. */ -void __init at91_aic_init (unsigned int *priority) +void __init at91_aic_init (unsigned int *priority,unsigned int ext_irq_mask) {unsigned int i;int irq_base; -if (at91_aic_pm_init ()) + at91_extern_irq =kzalloc (BITS_TO_LONGS (n_irqs) + *sizeof (*at91_extern_irq),GFP_KERNEL ); + +if (at91_aic_pm_init () || at91_extern_irq ==NULL )panic ("Unable to allocate bit maps\n" ); + *at91_extern_irq = ext_irq_mask; + at91_aic_base =ioremap (AT91_AIC ,512 );if (!at91_aic_base)panic ("Unable to ioremap AIC registers\n" );
arch/arm/mach-at91/setup.c +2 -2
@@ -47,7 +47,7 @@ void __init at91_init_irq_default(void)void __init at91_init_interrupts (unsigned int *priority) {/* Initialize the AIC interrupt controller */ -at91_aic_init (priority); +at91_aic_init (priority, at91_extern_irq);/* Enable GPIO interrupts */ at91_gpio_irq_setup ();
@@ -151,7 +151,7 @@ static void __init soc_detect(u32 dbgu_base) }/* at91sam9g10 */ -if ((cidr & ~AT91_CIDR_EXT ) ==ARCH_ID_AT91SAM9G10 ) { +if ((socid & ~AT91_CIDR_EXT ) ==ARCH_ID_AT91SAM9G10 ) { at91_soc_initdata.type =AT91_SOC_SAM9G10 ; at91_boot_soc = at91sam9261_soc; }
arch/arm/mach-exynos/common.c +5 -0
@@ -47,6 +47,7 @@#include <plat/fimc-core.h> #include <plat/iic-core.h> #include <plat/tv-core.h> +#include <plat/spi-core.h> #include <plat/regs-serial.h> #include "common.h"
@@ -346,6 +347,8 @@ static void __init exynos4_map_io(void)s5p_fb_setname (0 ,"exynos4-fb" );s5p_hdmi_setname ("exynos4-hdmi" ); + +s3c64xx_spi_setname ("exynos4210-spi" ); }static void __init exynos5_map_io (void )
@@ -366,6 +369,8 @@ static void __init exynos5_map_io(void)s3c_i2c0_setname ("s3c2440-i2c" );s3c_i2c1_setname ("s3c2440-i2c" );s3c_i2c2_setname ("s3c2440-i2c" ); + +s3c64xx_spi_setname ("exynos4210-spi" ); }static void __init exynos4_init_clocks (int xtal)
arch/arm/mach-s3c24xx/s3c2416.c +2 -0
@@ -61,6 +61,7 @@#include <plat/nand-core.h> #include <plat/adc-core.h> #include <plat/rtc-core.h> +#include <plat/spi-core.h> static struct map_desc s3c2416_iodesc[]__initdata = {IODESC_ENT (WATCHDOG ),
@@ -132,6 +133,7 @@ void __init s3c2416_map_io(void)/* initialize device information early */ s3c2416_default_sdhci0 ();s3c2416_default_sdhci1 (); +s3c64xx_spi_setname ("s3c2443-spi" );iotable_init (s3c2416_iodesc,ARRAY_SIZE (s3c2416_iodesc)); }
arch/arm/mach-s3c24xx/s3c2443.c +4 -0
@@ -43,6 +43,7 @@#include <plat/nand-core.h> #include <plat/adc-core.h> #include <plat/rtc-core.h> +#include <plat/spi-core.h> static struct map_desc s3c2443_iodesc[]__initdata = {IODESC_ENT (WATCHDOG ),
@@ -100,6 +101,9 @@ void __init s3c2443_map_io(void) s3c24xx_gpiocfg_default.set_pull = s3c2443_gpio_setpull; s3c24xx_gpiocfg_default.get_pull = s3c2443_gpio_getpull; +/* initialize device information early */ +s3c64xx_spi_setname ("s3c2443-spi" ); +iotable_init (s3c2443_iodesc,ARRAY_SIZE (s3c2443_iodesc)); }
arch/arm/mach-s5p64x0/common.c +3 -0
@@ -44,6 +44,7 @@#include <plat/sdhci.h> #include <plat/adc-core.h> #include <plat/fb-core.h> +#include <plat/spi-core.h> #include <plat/gpio-cfg.h> #include <plat/regs-irqtype.h> #include <plat/regs-serial.h>
@@ -179,6 +180,7 @@ void __init s5p6440_map_io(void)/* initialize any device information early */ s3c_adc_setname ("s3c64xx-adc" );s3c_fb_setname ("s5p64x0-fb" ); +s3c64xx_spi_setname ("s5p64x0-spi" );s5p64x0_default_sdhci0 ();s5p64x0_default_sdhci1 ();
@@ -193,6 +195,7 @@ void __init s5p6450_map_io(void)/* initialize any device information early */ s3c_adc_setname ("s3c64xx-adc" );s3c_fb_setname ("s5p64x0-fb" ); +s3c64xx_spi_setname ("s5p64x0-spi" );s5p64x0_default_sdhci0 ();s5p64x0_default_sdhci1 ();
arch/arm/mach-s5pc100/common.c +3 -0
@@ -45,6 +45,7 @@#include <plat/fb-core.h> #include <plat/iic-core.h> #include <plat/onenand-core.h> +#include <plat/spi-core.h> #include <plat/regs-serial.h> #include <plat/watchdog-reset.h>
@@ -165,6 +166,8 @@ void __init s5pc100_map_io(void)s3c_onenand_setname ("s5pc100-onenand" );s3c_fb_setname ("s5pc100-fb" );s3c_cfcon_setname ("s5pc100-pata" ); + +s3c64xx_spi_setname ("s5pc100-spi" ); }void __init s5pc100_init_clocks (int xtal)
arch/arm/mach-s5pv210/common.c +3 -0
@@ -43,6 +43,7 @@#include <plat/iic-core.h> #include <plat/keypad-core.h> #include <plat/tv-core.h> +#include <plat/spi-core.h> #include <plat/regs-serial.h> #include "common.h"
@@ -196,6 +197,8 @@ void __init s5pv210_map_io(void)/* setup TV devices */ s5p_hdmi_setname ("s5pv210-hdmi" ); + +s3c64xx_spi_setname ("s5pv210-spi" ); }void __init s5pv210_init_clocks (int xtal)
arch/arm/plat-samsung/include/plat/spi-core.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright (C) 2012 Heiko Stuebner <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __PLAT_S3C_SPI_CORE_H +#define __PLAT_S3C_SPI_CORE_H + +/* These functions are only for use with the core support code, such as +* the cpu specific initialisation code +*/ + +/* re-define device name depending on support. */ +static inline void s3c64xx_spi_setname (char *name) +{ +#ifdef CONFIG_S3C64XX_DEV_SPI0 + s3c64xx_device_spi0.name = name; +#endif +#ifdef CONFIG_S3C64XX_DEV_SPI1 + s3c64xx_device_spi1.name = name; +#endif +#ifdef CONFIG_S3C64XX_DEV_SPI2 + s3c64xx_device_spi2.name = name; +#endif +} + +#endif /* __PLAT_S3C_SPI_CORE_H */
arch/x86/include/asm/efi.h +1 -0
@@ -98,6 +98,7 @@ extern void efi_set_executable(efi_memory_desc_t *md, bool executable);extern int efi_memblock_x86_reserve_range (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void ); +extern void efi_unmap_memmap (void );#ifndef CONFIG_EFI /*
arch/x86/kernel/e820.c +3 -0
@@ -1077,6 +1077,9 @@ void __init memblock_x86_fill(void)memblock_add (ei->addr, ei->size); } +/* throw away partial pages */ +memblock_trim_memory (PAGE_SIZE ); +memblock_dump_all (); }
arch/x86/kernel/setup.c +20 -7
@@ -920,18 +920,19 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_64 if (max_pfn > max_low_pfn) {int i; -for (i =0 ; i < e820.nr_map; i++) { -struct e820entry *ei = &e820.map[i]; +unsigned long start, end; +unsigned long start_pfn, end_pfn; -if (ei->addr + ei->size <=1UL <<32 ) -continue ; +for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn, +NULL ) { -if (ei->type ==E820_RESERVED ) + end =PFN_PHYS (end_pfn); +if (end <= (1UL <<32 ))continue ; + start =PFN_PHYS (start_pfn); max_pfn_mapped =init_memory_mapping ( - ei->addr <1UL <<32 ?1UL <<32 : ei->addr, - ei->addr + ei->size); +max ((1UL <<32 ), start), end); }/* can we preseve max_low_pfn ?*/
@@ -1047,6 +1048,18 @@ void __init setup_arch(char **cmdline_p)mcheck_init ();arch_init_ideal_nops (); + +#ifdef CONFIG_EFI +/* Once setup is done above, disable efi_enabled on mismatched +* firmware/kernel archtectures since there is no support for +* runtime services. +*/ +if (efi_enabled &&IS_ENABLED (CONFIG_X86_64 ) != efi_64bit) { +pr_info ("efi: Setup done, disabling due to 32/64-bit mismatch\n" ); +efi_unmap_memmap (); + efi_enabled =0 ; + } +#endif }#ifdef CONFIG_X86_32
arch/x86/mm/init.c +31 -27
85 lines not on this page · raw message
arch/x86/mm/init_64.c +6 -1
@@ -386,7 +386,8 @@ phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end,* these mappings are more intelligent. */ if (pte_val (*pte)) { - pages++; +if (!after_bootmem) + pages++;continue ; }
@@ -451,6 +452,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,* attributes. */ if (page_size_mask & (1 <<PG_LEVEL_2M )) { +if (!after_bootmem) + pages++; last_map_addr = next;continue ; }
@@ -526,6 +529,8 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,* attributes. */ if (page_size_mask & (1 <<PG_LEVEL_1G )) { +if (!after_bootmem) + pages++; last_map_addr = next;continue ; }
arch/x86/platform/efi/efi.c +25 -18
108 lines not on this page · raw message
drivers/bcma/main.c +3 -2
@@ -141,9 +141,10 @@ static int bcma_register_cores(struct bcma_bus *bus)static void bcma_unregister_cores (struct bcma_bus *bus) { -struct bcma_device *core; +struct bcma_device *core, *tmp; -list_for_each_entry (core, &bus->cores, list) { +list_for_each_entry_safe (core, tmp, &bus->cores, list) { +list_del (&core->list);if (core->dev_registered)device_unregister (&core->dev); }
drivers/cpufreq/powernow-k8.c +1 -8
@@ -1223,14 +1223,7 @@ static int powernowk8_target(struct cpufreq_policy *pol,struct powernowk8_target_arg pta = { .pol = pol, .targfreq = targfreq, .relation = relation }; -/* -* Must run on @pol->cpu. cpufreq core is responsible for ensuring -* that we're bound to the current CPU and pol->cpu stays online. -*/ -if (smp_processor_id () == pol->cpu) -return powernowk8_target_fn (&pta); -else -return work_on_cpu (pol->cpu, powernowk8_target_fn, &pta); +return work_on_cpu (pol->cpu, powernowk8_target_fn, &pta); }/* Driver entry point to verify the policy and range of frequencies */
drivers/dma/imx-dma.c +3 -1
@@ -474,8 +474,10 @@ static int imxdma_xfer_desc(struct imxdma_desc *d) slot = i;break ; } -if (slot <0 ) +if (slot <0 ) { +spin_unlock_irqrestore (&imxdma->lock, flags);return -EBUSY ; + } imxdma->slots_2d[slot].xsr = d->x; imxdma->slots_2d[slot].ysr = d->y;
drivers/dma/sirf-dma.c +2 -2
@@ -109,7 +109,7 @@ static void sirfsoc_dma_execute(struct sirfsoc_dma_chan *schan) sdesc = list_first_entry(&schan->queued, struct sirfsoc_dma_desc, node);/* Move the first queued descriptor to active list */ -list_move_tail (&schan->queued, &schan->active); +list_move_tail (&sdesc->node, &schan->active);/* Start the DMA transfer */ writel_relaxed(sdesc->width, sdma->base + SIRFSOC_DMA_WIDTH_0 +
@@ -428,7 +428,7 @@ static struct dma_async_tx_descriptor *sirfsoc_dma_prep_interleaved(unsigned long iflags;int ret; -if ((xt->dir !=DMA_MEM_TO_DEV ) || (xt->dir !=DMA_DEV_TO_MEM )) { +if ((xt->dir !=DMA_MEM_TO_DEV ) && (xt->dir !=DMA_DEV_TO_MEM )) { ret = -EINVAL ; goto err_dir; }
drivers/extcon/extcon_class.c +7 -0
@@ -575,6 +575,10 @@ static void extcon_cleanup(struct extcon_dev *edev, bool skip)kfree (edev->cables); } +#if defined(CONFIG_ANDROID ) +if (switch_class) +class_compat_remove_link (switch_class, edev->dev,NULL ); +#endif device_unregister (edev->dev);put_device (edev->dev); }
@@ -821,6 +825,9 @@ module_init(extcon_class_init); static void __exit extcon_class_exit(void) { +#if defined(CONFIG_ANDROID ) +class_compat_unregister (switch_class); +#endif class_destroy (extcon_class); }module_exit (extcon_class_exit);
drivers/gpu/drm/radeon/evergreen_cs.c +1 -0
@@ -2829,6 +2829,7 @@ static bool evergreen_vm_reg_valid(u32 reg)case CAYMAN_SQ_EX_ALLOC_TABLE_SLOTS :return true;default : +DRM_ERROR ("Invalid register 0x%x in CS\n" , reg);return false; } }
drivers/hv/channel.c +13 -11
@@ -146,14 +146,14 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,if (ret !=0 ) { err = ret; - goto errorout; + goto error0; } ret =hv_ringbuffer_init ( &newchannel->inbound, in, recv_ringbuffer_size);if (ret !=0 ) { err = ret; - goto errorout; + goto error0; }
@@ -168,7 +168,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,if (ret !=0 ) { err = ret; - goto errorout; + goto error0; }/* Create and init the channel open message */
@@ -177,7 +177,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, GFP_KERNEL);if (!open_info) { err = -ENOMEM ; - goto errorout; + goto error0; }init_completion (&open_info->waitevent);
@@ -193,7 +193,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,if (userdatalen >MAX_USER_DEFINED_BYTES ) { err = -EINVAL ; - goto errorout; + goto error0; }if (userdatalen)
@@ -208,19 +208,18 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, sizeof(struct vmbus_channel_open_channel));if (ret !=0 ) - goto cleanup; + goto error1; t =wait_for_completion_timeout (&open_info->waitevent,5 *HZ );if (t ==0 ) { err = -ETIMEDOUT ; - goto errorout; + goto error1; }if (open_info->response.open_result.status) err = open_info->response.open_result.status; -cleanup:spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags);list_del (&open_info->msglistentry);spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags);
@@ -228,9 +227,12 @@ cleanup:kfree (open_info);return err; -errorout: -hv_ringbuffer_cleanup (&newchannel->outbound); -hv_ringbuffer_cleanup (&newchannel->inbound); +error1: +spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); +list_del (&open_info->msglistentry); +spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); + +error0:free_pages ((unsigned long )out,get_order (send_ringbuffer_size + recv_ringbuffer_size));kfree (open_info);
drivers/net/ethernet/tile/tilegx.c +19 -16
@@ -1334,11 +1334,11 @@ static int tso_count_edescs(struct sk_buff *skb) {struct skb_shared_info *sh =skb_shinfo (skb);unsigned int sh_len =skb_transport_offset (skb) +tcp_hdrlen (skb); -unsigned int data_len = skb->data_len + skb->hdr_len - sh_len; +unsigned int data_len = skb->len - sh_len;unsigned int p_len = sh->gso_size;long f_id =-1 ;/* id of the current fragment */ -long f_size = skb->hdr_len;/* size of the current fragment */ -long f_used = sh_len;/* bytes used from the current fragment */ +long f_size =skb_headlen (skb) - sh_len;/* current fragment size */ +long f_used =0 ;/* bytes used from the current fragment */ long n;/* size of the current piece of payload */ int num_edescs =0 ;int segment;
@@ -1353,7 +1353,7 @@ static int tso_count_edescs(struct sk_buff *skb)/* Advance as needed. */ while (f_used >= f_size) { f_id++; - f_size = sh->frags[f_id].size; + f_size =skb_frag_size (&sh->frags[f_id]); f_used =0 ; }
@@ -1384,13 +1384,13 @@ static void tso_headers_prepare(struct sk_buff *skb, unsigned char *headers,struct iphdr *ih;struct tcphdr *th;unsigned int sh_len =skb_transport_offset (skb) +tcp_hdrlen (skb); -unsigned int data_len = skb->data_len + skb->hdr_len - sh_len; +unsigned int data_len = skb->len - sh_len;unsigned char *data = skb->data;unsigned int ih_off, th_off, p_len;unsigned int isum_seed, tsum_seed, id, seq;long f_id =-1 ;/* id of the current fragment */ -long f_size = skb->hdr_len;/* size of the current fragment */ -long f_used = sh_len;/* bytes used from the current fragment */ +long f_size =skb_headlen (skb) - sh_len;/* current fragment size */ +long f_used =0 ;/* bytes used from the current fragment */ long n;/* size of the current piece of payload */ int segment;
@@ -1405,7 +1405,7 @@ static void tso_headers_prepare(struct sk_buff *skb, unsigned char *headers, isum_seed = ((0xFFFF - ih->check) + (0xFFFF - ih->tot_len) + (0xFFFF - ih->id)); - tsum_seed = th->check + (0xFFFF ^htons (sh_len + data_len)); + tsum_seed = th->check + (0xFFFF ^htons (skb->len)); id =ntohs (ih->id); seq =ntohl (th->seq);
@@ -1444,7 +1444,7 @@ static void tso_headers_prepare(struct sk_buff *skb, unsigned char *headers,/* Advance as needed. */ while (f_used >= f_size) { f_id++; - f_size = sh->frags[f_id].size; + f_size =skb_frag_size (&sh->frags[f_id]); f_used =0 ; }
@@ -1478,14 +1478,14 @@ static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue,struct tile_net_priv *priv =netdev_priv (dev);struct skb_shared_info *sh =skb_shinfo (skb);unsigned int sh_len =skb_transport_offset (skb) +tcp_hdrlen (skb); -unsigned int data_len = skb->data_len + skb->hdr_len - sh_len; +unsigned int data_len = skb->len - sh_len;unsigned int p_len = sh->gso_size;gxio_mpipe_edesc_t edesc_head = { {0 } };gxio_mpipe_edesc_t edesc_body = { {0 } };long f_id =-1 ;/* id of the current fragment */ -long f_size = skb->hdr_len;/* size of the current fragment */ -long f_used = sh_len;/* bytes used from the current fragment */ -void *f_data = skb->data; +long f_size =skb_headlen (skb) - sh_len;/* current fragment size */ +long f_used =0 ;/* bytes used from the current fragment */ +void *f_data = skb->data + sh_len;long n;/* size of the current piece of payload */ unsigned long tx_packets =0 , tx_bytes =0 ;unsigned int csum_start;
@@ -1516,15 +1516,18 @@ static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue,/* Egress the payload. */ while (p_used < p_len) { +void *va;/* Advance as needed. */ while (f_used >= f_size) { f_id++; - f_size = sh->frags[f_id].size; - f_used =0 ; + f_size =skb_frag_size (&sh->frags[f_id]); f_data =tile_net_frag_buf (&sh->frags[f_id]); + f_used =0 ; } + va = f_data + f_used; +/* Use bytes from the current fragment. */ n = p_len - p_used;if (n > f_size - f_used)
@@ -1533,7 +1536,7 @@ static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue, p_used += n;/* Egress a piece of the payload. */ - edesc_body.va =va_to_tile_io_addr (f_data) + f_used; + edesc_body.va =va_to_tile_io_addr (va); edesc_body.xfer_size = n; edesc_body.bound = !(p_used < p_len);gxio_mpipe_equeue_put_at (equeue, edesc_body, slot);
drivers/net/usb/cdc_ether.c +26 -15
53 lines not on this page · raw message
drivers/net/usb/qmi_wwan.c +14 -0
@@ -364,6 +364,20 @@ static const struct usb_device_id products[] = { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 57), .driver_info = (unsigned long )&qmi_wwan_info, }, + { /* Novatel USB551L and MC551 */ +USB_DEVICE_AND_INTERFACE_INFO (0x1410 ,0xb001 , +USB_CLASS_COMM , +USB_CDC_SUBCLASS_ETHERNET , +USB_CDC_PROTO_NONE ), + .driver_info = (unsigned long)&qmi_wwan_info, + }, + { /* Novatel E362 */ +USB_DEVICE_AND_INTERFACE_INFO (0x1410 ,0x9010 , +USB_CLASS_COMM , +USB_CDC_SUBCLASS_ETHERNET , +USB_CDC_PROTO_NONE ), + .driver_info = (unsigned long)&qmi_wwan_info, + }, /* 2. Combined interface devices matching on class+protocol */ { /* Huawei E367 and possibly others in "Windows mode" */
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +82 -82
189 lines not on this page · raw message
drivers/net/wireless/b43/main.c +4 -0
@@ -5374,6 +5374,8 @@ static void b43_bcma_remove(struct bcma_device *core)cancel_work_sync (&wldev->restart_work);B43_WARN_ON (!wl); +if (!wldev->fw.ucode.data) +return ;/* NULL if firmware never loaded */ if (wl->current_dev == wldev && wl->hw_registred) {b43_leds_stop (wldev);ieee80211_unregister_hw (wl->hw);
@@ -5448,6 +5450,8 @@ static void b43_ssb_remove(struct ssb_device *sdev)cancel_work_sync (&wldev->restart_work);B43_WARN_ON (!wl); +if (!wldev->fw.ucode.data) +return ;/* NULL if firmware never loaded */ if (wl->current_dev == wldev && wl->hw_registred) {b43_leds_stop (wldev);ieee80211_unregister_hw (wl->hw);
drivers/net/wireless/ipw2x00/ipw2200.c +1 -1
@@ -10479,7 +10479,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv, }else len = src->len; - dst =alloc_skb (len +sizeof (*rt_hdr),GFP_ATOMIC ); + dst =alloc_skb (len +sizeof (*rt_hdr) +sizeof (u16)*2 ,GFP_ATOMIC );if (!dst)continue ;
drivers/net/wireless/iwlwifi/dvm/devices.c +24 -15
@@ -518,7 +518,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,* See iwlagn_mac_channel_switch. */ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS ]; -struct iwl6000_channel_switch_cmd cmd; +struct iwl6000_channel_switch_cmd *cmd;u32 switch_time_in_usec, ucode_switch_time;u16 ch;u32 tsf_low;
@@ -527,18 +527,25 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,struct ieee80211_vif *vif = ctx->vif;struct iwl_host_cmd hcmd = { .id =REPLY_CHANNEL_SWITCH , - .len = {sizeof (cmd), }, + .len = {sizeof (*cmd), }, .flags =CMD_SYNC , - .data = { &cmd, }, + .dataflags[0 ] =IWL_HCMD_DFL_NOCOPY , }; +int err; - cmd.band = priv->band ==IEEE80211_BAND_2GHZ ; + cmd =kzalloc (sizeof (*cmd),GFP_KERNEL ); +if (!cmd) +return -ENOMEM ; + + hcmd.data[0 ] = cmd; + + cmd->band = priv->band ==IEEE80211_BAND_2GHZ ; ch = ch_switch->channel->hw_value;IWL_DEBUG_11H (priv,"channel switch from %u to %u\n" , ctx->active.channel, ch); - cmd.channel =cpu_to_le16 (ch); - cmd.rxon_flags = ctx->staging.flags; - cmd.rxon_filter_flags = ctx->staging.filter_flags; + cmd->channel =cpu_to_le16 (ch); + cmd->rxon_flags = ctx->staging.flags; + cmd->rxon_filter_flags = ctx->staging.filter_flags; switch_count = ch_switch->count; tsf_low = ch_switch->timestamp &0x0ffffffff ;/*
@@ -554,23 +561,25 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, switch_count =0 ; }if (switch_count <=1 ) - cmd.switch_time =cpu_to_le32 (priv->ucode_beacon_time); + cmd->switch_time =cpu_to_le32 (priv->ucode_beacon_time);else { switch_time_in_usec = vif->bss_conf.beacon_int * switch_count *TIME_UNIT ; ucode_switch_time =iwl_usecs_to_beacons (priv, switch_time_in_usec, beacon_interval); - cmd.switch_time =iwl_add_beacon_time (priv, - priv->ucode_beacon_time, - ucode_switch_time, - beacon_interval); + cmd->switch_time =iwl_add_beacon_time (priv, + priv->ucode_beacon_time, + ucode_switch_time, + beacon_interval); }IWL_DEBUG_11H (priv,"uCode time for the switch is 0x%x\n" , - cmd.switch_time); - cmd.expect_beacon = ch_switch->channel->flags &IEEE80211_CHAN_RADAR ; + cmd->switch_time); + cmd->expect_beacon = ch_switch->channel->flags &IEEE80211_CHAN_RADAR ; -return iwl_dvm_send_cmd (priv, &hcmd); + err =iwl_dvm_send_cmd (priv, &hcmd); +kfree (cmd); +return err; }struct iwl_lib_ops iwl6000_lib = {
drivers/rtc/rtc-imxdi.c +2 -0
@@ -392,6 +392,8 @@ static int dryice_rtc_probe(struct platform_device *pdev)if (imxdi->ioaddr ==NULL )return -ENOMEM ; +spin_lock_init (&imxdi->irq_lock); + imxdi->irq =platform_get_irq (pdev,0 );if (imxdi->irq <0 )return imxdi->irq;
drivers/staging/android/binder.c +28 -2
@@ -655,7 +655,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, page = &proc->pages[(page_addr - proc->buffer) /PAGE_SIZE ];BUG_ON (*page); - *page =alloc_page (GFP_KERNEL | __GFP_ZERO); + *page =alloc_page (GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);if (*page ==NULL ) {pr_err ("binder: %d: binder_alloc_buf failed " "for page at %p\n" , proc->pid, page_addr);
@@ -2507,14 +2507,38 @@ static void binder_release_work(struct list_head *list)struct binder_transaction *t; t = container_of(w, struct binder_transaction, work); -if (t->buffer->target_node && !(t->flags &TF_ONE_WAY )) +if (t->buffer->target_node && + !(t->flags &TF_ONE_WAY )) {binder_send_failed_reply (t,BR_DEAD_REPLY ); + }else { +binder_debug (BINDER_DEBUG_DEAD_TRANSACTION , +"binder: undelivered transaction %d\n" , + t->debug_id); + t->buffer->transaction =NULL ; +kfree (t); +binder_stats_deleted (BINDER_STAT_TRANSACTION ); + } }break ;case BINDER_WORK_TRANSACTION_COMPLETE : { +binder_debug (BINDER_DEBUG_DEAD_TRANSACTION , +"binder: undelivered TRANSACTION_COMPLETE\n" );kfree (w);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE ); }break ; +case BINDER_WORK_DEAD_BINDER_AND_CLEAR : +case BINDER_WORK_CLEAR_DEATH_NOTIFICATION : { +struct binder_ref_death *death; + + death = container_of(w, struct binder_ref_death, work); +binder_debug (BINDER_DEBUG_DEAD_TRANSACTION , +"binder: undelivered death notification, %p\n" , + death->cookie); +kfree (death); +binder_stats_deleted (BINDER_STAT_DEATH ); + }break ;default : +pr_err ("binder: unexpected work type, %d, not freed\n" , + w->type);break ; } }
@@ -2984,6 +3008,7 @@ static void binder_deferred_release(struct binder_proc *proc) nodes++;rb_erase (&node->rb_node, &proc->nodes);list_del_init (&node->work.entry); +binder_release_work (&node->async_todo);if (hlist_empty (&node->refs)) {kfree (node);binder_stats_deleted (BINDER_STAT_NODE );
@@ -3022,6 +3047,7 @@ static void binder_deferred_release(struct binder_proc *proc)binder_delete_ref (ref); }binder_release_work (&proc->todo); +binder_release_work (&proc->delivered_death); buffers =0 ;while ((n =rb_first (&proc->allocated_buffers))) {
drivers/staging/comedi/drivers/amplc_dio200.c +2 -0
@@ -1429,6 +1429,8 @@ static void dio200_detach(struct comedi_device *dev)const struct dio200_layout_struct *layout;unsigned n; +if (!thisboard) +return ;if (dev->irq)free_irq (dev->irq, dev);if (dev->subdevices) {
drivers/staging/comedi/drivers/amplc_pc236.c +4 -2
@@ -577,10 +577,12 @@ static int __devinit pc236_attach_pci(struct comedi_device *dev,static void pc236_detach (struct comedi_device *dev) { -struct pc236_private *devpriv = dev->private; +const struct pc236_board *thisboard =comedi_board (dev);struct pci_dev *pcidev =comedi_to_pci_dev (dev); -if (devpriv) +if (!thisboard) +return ; +if (dev->iobase)pc236_intr_disable (dev);if (dev->irq)free_irq (dev->irq, dev);
drivers/staging/comedi/drivers/amplc_pc263.c +3 -0
@@ -310,8 +310,11 @@ static int __devinit pc263_attach_pci(struct comedi_device *dev,static void pc263_detach (struct comedi_device *dev) { +const struct pc263_board *thisboard =comedi_board (dev);struct pci_dev *pcidev =comedi_to_pci_dev (dev); +if (!thisboard) +return ;if (pcidev) {if (dev->iobase)comedi_pci_disable (pcidev);
drivers/staging/comedi/drivers/das08.c +2 -0
@@ -1028,6 +1028,8 @@ static void __maybe_unused das08_detach(struct comedi_device *dev)const struct das08_board_struct *thisboard =comedi_board (dev);struct das08_private_struct *devpriv = dev->private; +if (!thisboard) +return ;das08_common_detach (dev);if (IS_ENABLED (CONFIG_COMEDI_DAS08_ISA ) && (thisboard->bustype == isa || thisboard->bustype == pc104)) {
drivers/staging/comedi/drivers/ni_daq_700.c +1 -1
@@ -71,7 +71,7 @@ static int subdev_700_insn(struct comedi_device *dev, } data[1 ] = s->state &0xff ; - data[1 ] |=inb (dev->iobase +DIO_R ); + data[1 ] |=inb (dev->iobase +DIO_R ) <<8 ;return insn->n; }
drivers/staging/comedi/drivers/ni_labpc.c +2 -0
@@ -809,6 +809,8 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot)void labpc_common_detach (struct comedi_device *dev) { +if (!thisboard) +return ;if (dev->subdevices)subdev_8255_cleanup (dev, dev->subdevices +2 );#ifdef CONFIG_ISA_DMA_API
drivers/staging/zram/zram_drv.c +10 -2
@@ -223,8 +223,13 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, cmem =zs_map_object (zram->mem_pool, zram->table[index].handle,ZS_MM_RO ); - ret =lzo1x_decompress_safe (cmem, zram->table[index].size, +if (zram->table[index].size ==PAGE_SIZE ) { +memcpy (uncmem, cmem,PAGE_SIZE ); + ret =LZO_E_OK ; + }else { + ret =lzo1x_decompress_safe (cmem, zram->table[index].size, uncmem, &clen); + }if (is_partial_io (bvec)) { memcpy(user_mem + bvec->bv_offset, uncmem + offset,
@@ -342,8 +347,11 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, goto out; } -if (unlikely (clen > max_zpage_size)) +if (unlikely (clen > max_zpage_size)) {zram_stat_inc (&zram->stats.bad_compress); + src = uncmem; + clen =PAGE_SIZE ; + } handle =zs_malloc (zram->mem_pool, clen);if (!handle) {
drivers/usb/core/hub.c +5 -2
@@ -730,13 +730,16 @@ static void hub_tt_work(struct work_struct *work)int limit =100 ;spin_lock_irqsave (&hub->tt.lock, flags); -while (--limit && !list_empty (&hub->tt.clear_list)) { +while (!list_empty (&hub->tt.clear_list)) {struct list_head *next;struct usb_tt_clear *clear;struct usb_device *hdev = hub->hdev;const struct hc_driver *drv;int status; +if (!hub->quiescing && --limit <0 ) +break ; + next = hub->tt.clear_list.next; clear = list_entry (next, struct usb_tt_clear, clear_list);list_del (&clear->clear_list);
@@ -1201,7 +1204,7 @@ static void hub_quiesce(struct usb_hub *hub, enum hub_quiescing_type type)if (hub->has_indicators)cancel_delayed_work_sync (&hub->leds);if (hub->tt.hub) -cancel_work_sync (&hub->tt.clear_work); +flush_work_sync (&hub->tt.clear_work); }/* caller has locked the hub device */
drivers/usb/host/pci-quirks.c +8 -1
@@ -545,7 +545,14 @@ static const struct dmi_system_id __devinitconst ehci_dmi_nohandoff_table[] = {/* Pegatron Lucid (Ordissimo AIRIS) */ .matches = {DMI_MATCH (DMI_BOARD_NAME ,"M11JB" ), - DMI_MATCH(DMI_BIOS_VERSION, "Lucid-GE-133"), + DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"), + }, + }, + { +/* Pegatron Lucid (Ordissimo) */ + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"Ordissimo" ), + DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"), }, }, { }
drivers/usb/host/xhci-ring.c +11 -0
@@ -1228,6 +1228,17 @@ static void xhci_cmd_to_noop(struct xhci_hcd *xhci, struct xhci_cd *cur_cd) cur_seg =find_trb_seg (xhci->cmd_ring->first_seg, xhci->cmd_ring->dequeue, &cycle_state); +if (!cur_seg) { +xhci_warn (xhci,"Command ring mismatch, dequeue = %p %llx (dma)\n" , + xhci->cmd_ring->dequeue, + (unsigned long long ) +xhci_trb_virt_to_dma (xhci->cmd_ring->deq_seg, + xhci->cmd_ring->dequeue)); +xhci_debug_ring (xhci, xhci->cmd_ring); +xhci_dbg_ring_ptrs (xhci, xhci->cmd_ring); +return ; + } +/* find the command trb matched by cd from command ring */ for (cmd_trb = xhci->cmd_ring->dequeue; cmd_trb != xhci->cmd_ring->enqueue;
drivers/usb/host/xhci.c +2 -2
@@ -4020,7 +4020,7 @@ int xhci_update_device(struct usb_hcd *hcd, struct usb_device *udev)static unsigned long long xhci_service_interval_to_ns (struct usb_endpoint_descriptor *desc) { -return (1 << (desc->bInterval -1 )) *125 *1000 ; +return (1ULL << (desc->bInterval -1 )) *125 *1000 ; } static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev,
@@ -4141,7 +4141,7 @@ static u16 xhci_calculate_intel_u2_timeout(struct usb_device *udev, (xhci_service_interval_to_ns(desc) > timeout_ns)) timeout_ns =xhci_service_interval_to_ns (desc); - u2_del_ns = udev->bos->ss_cap->bU2DevExitLat *1000 ; + u2_del_ns =le16_to_cpu (udev->bos->ss_cap->bU2DevExitLat) *1000ULL ;if (u2_del_ns > timeout_ns) timeout_ns = u2_del_ns;
drivers/usb/serial/ch341.c +16 -7
@@ -241,13 +241,11 @@ out: kfree(buffer);return r; } -/* allocate private data */ -static int ch341_attach (struct usb_serial *serial) +static int ch341_port_probe (struct usb_serial_port *port) {struct ch341_private *priv;int r; -/* private data */ priv =kzalloc (sizeof (struct ch341_private ),GFP_KERNEL );if (!priv)return -ENOMEM ;
@@ -257,17 +255,27 @@ static int ch341_attach(struct usb_serial *serial) priv->baud_rate =DEFAULT_BAUD_RATE ; priv->line_control =CH341_BIT_RTS |CH341_BIT_DTR ; - r =ch341_configure (serial->dev, priv); + r =ch341_configure (port->serial->dev, priv);if (r <0 ) goto error; -usb_set_serial_port_data (serial->port[0 ], priv); +usb_set_serial_port_data (port, priv);return 0 ; error:kfree (priv);return r; } +static int ch341_port_remove (struct usb_serial_port *port) +{ +struct ch341_private *priv; + + priv =usb_get_serial_port_data (port); +kfree (priv); + +return 0 ; +} +static int ch341_carrier_raised (struct usb_serial_port *port) {struct ch341_private *priv =usb_get_serial_port_data (port);
@@ -303,7 +311,7 @@ static void ch341_close(struct usb_serial_port *port)static int ch341_open (struct tty_struct *tty,struct usb_serial_port *port) {struct usb_serial *serial = port->serial; -struct ch341_private *priv =usb_get_serial_port_data (serial->port[0 ]); +struct ch341_private *priv =usb_get_serial_port_data (port);int r; priv->baud_rate =DEFAULT_BAUD_RATE ;
@@ -606,7 +614,8 @@ static struct usb_serial_driver ch341_device = { .tiocmget = ch341_tiocmget, .tiocmset = ch341_tiocmset, .read_int_callback = ch341_read_int_callback, - .attach = ch341_attach, + .port_probe = ch341_port_probe, + .port_remove = ch341_port_remove, .reset_resume = ch341_reset_resume, };
drivers/usb/serial/digi_acceleport.c +67 -50
159 lines not on this page · raw message
drivers/usb/serial/ipw.c +3 -4
@@ -209,8 +209,7 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)return 0 ; } -/* fake probe - only to allocate data structures */ -static int ipw_probe (struct usb_serial *serial,const struct usb_device_id *id) +static int ipw_attach (struct usb_serial *serial) {struct usb_wwan_intf_private *data;
@@ -310,9 +309,9 @@ static struct usb_serial_driver ipw_device = { .num_ports = 1, .open = ipw_open, .close = ipw_close, - .probe = ipw_probe, - .attach = usb_wwan_startup, + .attach = ipw_attach, .release = ipw_release, + .port_probe = usb_wwan_port_probe, .port_remove = usb_wwan_port_remove, .dtr_rts = ipw_dtr_rts, .write = usb_wwan_write,
drivers/usb/serial/keyspan.c +88 -95
235 lines not on this page · raw message
drivers/usb/serial/keyspan.h +8 -0
@@ -42,6 +42,8 @@ static void keyspan_dtr_rts (struct usb_serial_port *port, int on);static int keyspan_startup (struct usb_serial *serial);static void keyspan_disconnect (struct usb_serial *serial);static void keyspan_release (struct usb_serial *serial); +static int keyspan_port_probe (struct usb_serial_port *port); +static int keyspan_port_remove (struct usb_serial_port *port);static int keyspan_write_room (struct tty_struct *tty); static int keyspan_write (struct tty_struct *tty,
@@ -562,6 +564,8 @@ static struct usb_serial_driver keyspan_1port_device = { .attach = keyspan_startup, .disconnect = keyspan_disconnect, .release = keyspan_release, + .port_probe = keyspan_port_probe, + .port_remove = keyspan_port_remove, };static struct usb_serial_driver keyspan_2port_device = {
@@ -584,6 +588,8 @@ static struct usb_serial_driver keyspan_2port_device = { .attach = keyspan_startup, .disconnect = keyspan_disconnect, .release = keyspan_release, + .port_probe = keyspan_port_probe, + .port_remove = keyspan_port_remove, };static struct usb_serial_driver keyspan_4port_device = {
@@ -606,6 +612,8 @@ static struct usb_serial_driver keyspan_4port_device = { .attach = keyspan_startup, .disconnect = keyspan_disconnect, .release = keyspan_release, + .port_probe = keyspan_port_probe, + .port_remove = keyspan_port_remove, };static struct usb_serial_driver *const serial_drivers[] = {
drivers/usb/serial/mct_u232.c +33 -26
95 lines not on this page · raw message
drivers/usb/serial/metro-usb.c +19 -46
94 lines not on this page · raw message
drivers/usb/serial/mos7720.c +32 -30
93 lines not on this page · raw message
drivers/usb/serial/mos7840.c +3 -27
@@ -218,12 +218,10 @@ struct moschip_port {int port_num;/*Actual port number in the device(1,2,etc) */ struct urb *write_urb;/* write URB for this port */ struct urb *read_urb;/* read URB for this port */ -struct urb *int_urb;__u8 shadowLCR;/* last LCR value received */ __u8 shadowMCR;/* last MCR value received */ char open;char open_ports; -char zombie;wait_queue_head_t wait_chase;/* for handling sleeping while waiting for chase to finish */ wait_queue_head_t delta_msr_wait;/* for handling sleeping while waiting for msr change to happen */ int delta_msr_cond;
@@ -493,7 +491,6 @@ static void mos7840_control_callback(struct urb *urb)unsigned char *data;struct moschip_port *mos7840_port;__u8 regval =0x0 ; -int result =0 ;int status = urb->status; mos7840_port = urb->context;
@@ -512,7 +509,7 @@ static void mos7840_control_callback(struct urb *urb)default :dbg ("%s - nonzero urb status received: %d" , __func__, status); - goto exit; +return ; }dbg ("%s urb buffer size is %d" , __func__, urb->actual_length);
@@ -525,17 +522,6 @@ static void mos7840_control_callback(struct urb *urb)mos7840_handle_new_msr (mos7840_port, regval); else if (mos7840_port->MsrLsr == 1) mos7840_handle_new_lsr(mos7840_port, regval); - -exit: -spin_lock (&mos7840_port->pool_lock); -if (!mos7840_port->zombie) - result =usb_submit_urb (mos7840_port->int_urb,GFP_ATOMIC ); -spin_unlock (&mos7840_port->pool_lock); -if (result) { -dev_err (&urb->dev->dev, -"%s - Error %d submitting interrupt urb\n" , - __func__, result); - } } static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,
@@ -704,14 +690,7 @@ static void mos7840_interrupt_callback(struct urb *urb) wreg =MODEM_STATUS_REGISTER ;break ; } -spin_lock (&mos7840_port->pool_lock); -if (!mos7840_port->zombie) { - rv =mos7840_get_reg (mos7840_port, wval, wreg, &Data); - }else { -spin_unlock (&mos7840_port->pool_lock); -return ; - } -spin_unlock (&mos7840_port->pool_lock); + rv =mos7840_get_reg (mos7840_port, wval, wreg, &Data); } } }
@@ -2684,7 +2663,6 @@ error:kfree (mos7840_port->ctrl_buf);usb_free_urb (mos7840_port->control_urb);kfree (mos7840_port); - serial->port[i] =NULL ; }return status; }
@@ -2714,9 +2692,6 @@ static void mos7840_disconnect(struct usb_serial *serial) mos7840_port =mos7840_get_port_private (serial->port[i]);dbg ("mos7840_port %d = %p" , i, mos7840_port);if (mos7840_port) { -spin_lock_irqsave (&mos7840_port->pool_lock, flags); - mos7840_port->zombie =1 ; -spin_unlock_irqrestore (&mos7840_port->pool_lock, flags);usb_kill_urb (mos7840_port->control_urb); } }
@@ -2754,6 +2729,7 @@ static void mos7840_release(struct usb_serial *serial)del_timer_sync (&mos7840_port->led_timer1);del_timer_sync (&mos7840_port->led_timer2); } +usb_free_urb (mos7840_port->control_urb);kfree (mos7840_port->ctrl_buf);kfree (mos7840_port->dr);kfree (mos7840_port);
drivers/usb/serial/omninet.c +18 -18
@@ -46,8 +46,8 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, const unsigned char *buf, int count);static int omninet_write_room (struct tty_struct *tty);static void omninet_disconnect (struct usb_serial *serial); -static void omninet_release (struct usb_serial *serial); -static int omninet_attach (struct usb_serial *serial); +static int omninet_port_probe (struct usb_serial_port *port); +static int omninet_port_remove (struct usb_serial_port *port);static const struct usb_device_id id_table[] = { {USB_DEVICE (ZYXEL_VENDOR_ID ,ZYXEL_OMNINET_ID ) },
@@ -64,7 +64,8 @@ static struct usb_serial_driver zyxel_omninet_device = { .description = "ZyXEL - omni.net lcd plus usb", .id_table = id_table, .num_ports = 1, - .attach = omninet_attach, + .port_probe = omninet_port_probe, + .port_remove = omninet_port_remove, .open = omninet_open, .close = omninet_close, .write = omninet_write,
@@ -72,7 +73,6 @@ static struct usb_serial_driver zyxel_omninet_device = { .read_bulk_callback = omninet_read_bulk_callback, .write_bulk_callback = omninet_write_bulk_callback, .disconnect = omninet_disconnect, - .release = omninet_release, };static struct usb_serial_driver *const serial_drivers[] = {
@@ -114,18 +114,26 @@ struct omninet_data {__u8 od_outseq;/* Sequence number for bulk_out URBs */ }; -static int omninet_attach (struct usb_serial *serial) +static int omninet_port_probe (struct usb_serial_port *port) {struct omninet_data *od; -struct usb_serial_port *port = serial->port[0 ]; od =kmalloc (sizeof (struct omninet_data ),GFP_KERNEL ); -if (!od) { -dev_err (&port->dev,"%s- kmalloc(%Zd) failed.\n" , - __func__,sizeof (struct omninet_data )); +if (!od)return -ENOMEM ; - } +usb_set_serial_port_data (port, od); + +return 0 ; +} + +static int omninet_port_remove (struct usb_serial_port *port) +{ +struct omninet_data *od; + + od =usb_get_serial_port_data (port); +kfree (od); +return 0 ; }
@@ -291,14 +299,6 @@ static void omninet_disconnect(struct usb_serial *serial)usb_kill_urb (wport->write_urb); } - -static void omninet_release (struct usb_serial *serial) -{ -struct usb_serial_port *port = serial->port[0 ]; - -kfree (usb_get_serial_port_data (port)); -} -module_usb_serial_driver (serial_drivers, id_table);MODULE_AUTHOR (DRIVER_AUTHOR );
drivers/usb/serial/opticon.c +9 -2
@@ -158,7 +158,11 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, {struct usb_serial *serial = port->serial;int retval; -u8 buffer[2 ]; +u8 *buffer; + + buffer =kzalloc (1 ,GFP_KERNEL ); +if (!buffer) +return -ENOMEM ; buffer[0 ] = val;/* Send the message to the vendor control endpoint
@@ -167,6 +171,7 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, requesttype,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_INTERFACE , 0, 0, buffer, 1, 0); +kfree (buffer);return retval; }
@@ -284,7 +289,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,if (!dr) {dev_err (&port->dev,"out of memory\n" ); count = -ENOMEM ; - goto error; + goto error_no_dr; } dr->bRequestType =USB_TYPE_VENDOR |USB_RECIP_INTERFACE |USB_DIR_OUT ;
@@ -314,6 +319,8 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,return count; error: +kfree (dr); +error_no_dr:usb_free_urb (urb); error_no_urb:kfree (buffer);
drivers/usb/serial/option.c +20 -3
@@ -47,6 +47,7 @@/* Function prototypes */ static int option_probe (struct usb_serial *serial,const struct usb_device_id *id); +static int option_attach (struct usb_serial *serial);static void option_release (struct usb_serial *serial);static int option_send_setup (struct usb_serial_port *port);static void option_instat_callback (struct urb *urb);
@@ -1288,8 +1289,9 @@ static struct usb_serial_driver option_1port_device = { .tiocmget = usb_wwan_tiocmget, .tiocmset = usb_wwan_tiocmset, .ioctl = usb_wwan_ioctl, - .attach = usb_wwan_startup, + .attach = option_attach, .release = option_release, + .port_probe = usb_wwan_port_probe, .port_remove = usb_wwan_port_remove, .read_int_callback = option_instat_callback, #ifdef CONFIG_PM
@@ -1337,8 +1339,6 @@ static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,static int option_probe (struct usb_serial *serial,const struct usb_device_id *id) { -struct usb_wwan_intf_private *data; -struct option_private *priv;struct usb_interface_descriptor *iface_desc = &serial->interface->cur_altsetting->desc;struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
@@ -1376,6 +1376,19 @@ static int option_probe(struct usb_serial *serial, iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA) return -ENODEV; +/* Store device id so we can use it during attach. */ +usb_set_serial_data (serial, (void *)id); + +return 0 ; +} + +static int option_attach (struct usb_serial *serial) +{ +struct usb_interface_descriptor *iface_desc; +const struct usb_device_id *id; +struct usb_wwan_intf_private *data; +struct option_private *priv; + data =kzalloc (sizeof (struct usb_wwan_intf_private ),GFP_KERNEL );if (!data)return -ENOMEM ;
@@ -1386,6 +1399,10 @@ static int option_probe(struct usb_serial *serial,return -ENOMEM ; } +/* Retrieve device id stored at probe. */ + id =usb_get_serial_data (serial); + iface_desc = &serial->interface->cur_altsetting->desc; + priv->bInterfaceNumber = iface_desc->bInterfaceNumber; data->private = priv;
drivers/usb/serial/qcserial.c +17 -16
@@ -140,7 +140,6 @@ MODULE_DEVICE_TABLE(usb, id_table);static int qcprobe (struct usb_serial *serial,const struct usb_device_id *id) { -struct usb_wwan_intf_private *data;struct usb_host_interface *intf = serial->interface->cur_altsetting;struct device *dev = &serial->dev->dev;int retval = -ENODEV ;
@@ -156,13 +155,6 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id) ifnum = intf->desc.bInterfaceNumber;dev_dbg (dev,"This Interface = %d\n" , ifnum); - data =kzalloc (sizeof (struct usb_wwan_intf_private ), -GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -spin_lock_init (&data->susp_lock); -if (nintf ==1 ) {/* QDL mode */ /* Gobi 2000 has a single altsetting, older ones have two */
@@ -255,20 +247,28 @@ done: } } -/* Set serial->private if not returning error */ -if (retval ==0 ) -usb_set_serial_data (serial, data); -else -kfree (data); -return retval; } +static int qc_attach (struct usb_serial *serial) +{ +struct usb_wwan_intf_private *data; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + +spin_lock_init (&data->susp_lock); + +usb_set_serial_data (serial, data); + +return 0 ; +} +static void qc_release (struct usb_serial *serial) {struct usb_wwan_intf_private *priv =usb_get_serial_data (serial); -/* Free the private data allocated in qcprobe */ usb_set_serial_data (serial,NULL );kfree (priv); }
@@ -287,8 +287,9 @@ static struct usb_serial_driver qcdevice = { .write = usb_wwan_write, .write_room = usb_wwan_write_room, .chars_in_buffer = usb_wwan_chars_in_buffer, - .attach = usb_wwan_startup, + .attach = qc_attach, .release = qc_release, + .port_probe = usb_wwan_port_probe, .port_remove = usb_wwan_port_remove, #ifdef CONFIG_PM .suspend = usb_wwan_suspend,
drivers/usb/serial/quatech2.c +61 -74
213 lines not on this page · raw message
drivers/usb/serial/sierra.c +68 -65
171 lines not on this page · raw message
drivers/usb/serial/usb-wwan.h +1 -1
@@ -8,7 +8,7 @@extern void usb_wwan_dtr_rts (struct usb_serial_port *port,int on);extern int usb_wwan_open (struct tty_struct *tty,struct usb_serial_port *port);extern void usb_wwan_close (struct usb_serial_port *port); -extern int usb_wwan_startup (struct usb_serial *serial); +extern int usb_wwan_port_probe (struct usb_serial_port *port);extern int usb_wwan_port_remove (struct usb_serial_port *port);extern int usb_wwan_write_room (struct tty_struct *tty); extern void usb_wwan_set_termios(struct tty_struct *tty,
drivers/usb/serial/usb_wwan.c +53 -77
108 lines not on this page · raw message
drivers/usb/serial/whiteheat.c +27 -33
60 lines not on this page · raw message
fs/lockd/mon.c +32 -25
57 lines not on this page · raw message
fs/nfs/blocklayout/blocklayout.c +68 -25
93 lines not on this page · raw message
net/sunrpc/xprtsock.c +10 -31
41 lines not on this page · raw message
usr/gen_init_cpio.c +23 -20
43 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 33 lines · Greg KH
Quoted 19 lines · Eddie Chapman
On 3.6.5 my rt2800usb adapter's speeds (measured downloading a file on the my LAN with wget) dropped down to around 900 Kbyte/s from the usual approx. 4 Mbyte/s. Also some packet loss and latency spikes. Nothing unusual reported in dmesg.
Rebooting back into 3.6.4 with identical .config and the problem goes away.
So I reversed the following 4 patches introduced in 3.6.5:
Felix Fietkau:
mac80211: useieee80211_free_txskbin a few more placesJohannes Berg:
mac80211: connect with HT20 if HT40 is not permittedStanislaw Gruszka:
mac80211: check if key has TKIP type before updating IV cfg80211/mac80211: avoid state mishmash on deauthQuoted 5 lines
rebuilt 3.6.5, rebooted into it, and speeds back to normal.
Sorry can't be more specific, didn't have enough time to revert each one individually to find out which one caused the regression. Though if anyone would really like me to find out let me know.
I would, if you could narrow this down to one patch, that would be great.
Also, copying the wireless developers on the email about this, would be best, there's nothing that the stable tree developers can do about this on their own.
Quoted 6 lines
And, can you also test 3.7-rc4, to ensure that the problem isn't there as well?
thanks,
greg k-h
Thanks Greg.
I've narrowed it down to this patch which introduces the problem:
Johannes Berg:
mac80211: connect with HT20 if HT40 is not permitted
commit: 3a40414f826a8f1096d9b94c4a53ef91b25ba28d
The other 3 patches above give me no problems at all, so I am now running my 3.6.5 with those 3 back in, and just the HT20/HT40 patch removed, and throughput is perfect. As soon as I introduce the patch HT20/HT40 throughput drops right down to a fifth of what it was.
So I've copied into this message the original people from the HT20/HT40 patch as well as linux-wireless.
This is my original message in full sent to stable list for the benefit of the new recipients:
http://www.mail-archive.com/[email protected]/msg22645.html
If I can do anything else to help figure out why this patch causes problems for my device, please let me know.
thanks,
Eddie
Quoted 6 lines · Eddie Chapman
Quoted 2 lines
And, can you also test 3.7-rc4, to ensure that the problem isn't there as well?
I've narrowed it down to this patch which introduces the problem:
Quoted 8 lines
Johannes Berg:
mac80211: connect with HT20 if HT40 is not permitted
commit:3a40414f826a8f1096d9b94c4a53ef91b25ba28dThe other 3 patches above give me no problems at all, so I am now running my 3.6.5 with those 3 back in, and just the HT20/HT40 patch removed, and throughput is perfect. As soon as I introduce the patch HT20/HT40 throughput drops right down to a fifth of what it was.
This should also be the case on 3.7-rc4, since the patch came from there, and I don't see any reason to believe rt2800 would behave differently here, for some reason.
Can you show me the contents of
the /sys/kernel/debug/ieee80211/phy0/ht40allow_map debugfs file and "iw reg get" command?
johannes
Quoted 21 lines · Johannes Berg
Quoted 6 lines · Eddie Chapman
Quoted 2 lines
And, can you also test 3.7-rc4, to ensure that the problem isn't there as well?
I've narrowed it down to this patch which introduces the problem:
Quoted 8 lines
Johannes Berg:
mac80211: connect with HT20 if HT40 is not permitted
commit:3a40414f826a8f1096d9b94c4a53ef91b25ba28dThe other 3 patches above give me no problems at all, so I am now running my 3.6.5 with those 3 back in, and just the HT20/HT40 patch removed, and throughput is perfect. As soon as I introduce the patch HT20/HT40 throughput drops right down to a fifth of what it was.
This should also be the case on 3.7-rc4, since the patch came from there, and I don't see any reason to believe rt2800 would behave differently here, for some reason.
Quoted 5 lines
Can you show me the contents of
the/sys/kernel/debug/ieee80211/phy0/ht40allow_mapdebugfs file and "iw reg get" command?johannes
Hi Johannes,
Here is the output of /sys/kernel/debug/ieee80211/phy0/ht40allow_map:
2412 HT40 + 2417 HT40 + 2422 HT40 + 2427 HT40 +
2432 HT40 -+
2437 HT40 -+
2442 HT40 -+
2447 HT40 -
2452 HT40 -
2457 HT40 -
2462 HT40 -
2467 HT40
2472 HT40
2484 HT40
and "iw reg get" says:
country 00:
(2402 - 2472 @ 40), (6, 20) (2457 - 2482 @ 20), (6, 20), PASSIVE-SCAN, NO-IBSS (2474 - 2494 @ 20), (6, 20), NO-OFDM, PASSIVE-SCAN, NO-IBSS (5170 - 5250 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS (5735 - 5835 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS (57240 - 63720 @ 2160), (N/A, 0)
I captured both of these with the HT20/HT40 patch applied.
let me know if you need anything else.
thanks,
Eddie
Hi Eddie,
Quoted 1 line
Here is the output of
/sys/kernel/debug/ieee80211/phy0/ht40allow_map:
Ok, thanks.
Quoted 4 lines
2412 HT40 + 2417 HT40 + 2422 HT40 + 2427 HT40 +
Quoted 10 lines
2432 HT40 -+
2437 HT40 -+
2442 HT40 -+
2447 HT40 -
2452 HT40 -
2457 HT40 -
2462 HT40 -
2467 HT40
2472 HT40
2484 HT40
That looks correct.
Quoted 9 lines
and "iw reg get" says:
country 00:
(2402 - 2472 @ 40), (6, 20) (2457 - 2482 @ 20), (6, 20), PASSIVE-SCAN, NO-IBSS (2474 - 2494 @ 20), (6, 20), NO-OFDM, PASSIVE-SCAN, NO-IBSS (5170 - 5250 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS (5735 - 5835 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS (57240 - 63720 @ 2160), (N/A, 0)
That also looks fine.
Quoted 1 line
I captured both of these with the HT20/HT40 patch applied.
Ok, that shouldn't change anything in this case, but good to know.
Quoted 1 line
let me know if you need anything else.
Yeah, I forgot to ask about the AP. Can you show the output of "iw wlan0 scan dump" for your AP while you're connected? It should show something like this (note the "associated" indication):
BSS 02:00:00:00:00:00 (on wlan1) -- associated
TSF: 1352188517669470 usec (15650d, 07:55:17) freq: 2432 [...]
I'm particularly interested in the "freq" (as above) and the HT capabilities/operation information.
johannes
Hi Johannes,
Quoted 11 lines
Yeah, I forgot to ask about the AP. Can you show the output of "iw wlan0 scan dump" for your AP while you're connected? It should show something like this (note the "associated" indication):
BSS 02:00:00:00:00:00 (on wlan1) -- associated
TSF: 1352188517669470 usec (15650d, 07:55:17) freq: 2432 [...]I'm particularly interested in the "freq" (as above) and the HT capabilities/operation information.
The AP is a Netgear WNR2000v3 running DD-WRT v24-sp2 (03/19/12) std.
After sshing into it and playing around with the iw command, the phy is phy0 and the device is ath0.
"iw ath0 scan dump" returns nothing unfortunately.
In case it helps, on the laptop (the client) I do get output from "iw wlan0 scan dump":
BSS 82:e1:fa:1a:65:00 (on wlan0) -- associated
TSF: 2791936678 usec (0d, 00:46:31)
freq: 2452
beacon interval: 100
capability: ESS Privacy ShortSlotTime (0x0411)
signal: -37.00 dBm
last seen: 98451 ms ago
Information elements from Probe Response frame:
SSID: e79164285
Supported rates: 1.0* 2.0* 5.5* 11.0* 6.0 9.0 12.0 18.0 DS Parameter set: channel 9
ERP: Barker_Preamble_Mode
Extended supported rates: 24.0 36.0 48.0 54.0
RSN: * Version: 1
* Group cipher: CCMP
* Pairwise ciphers: CCMP
* Authentication suites: PSK
* Capabilities: 16-PTKSA-RC (0x000c)
HT capabilities:
Capabilities: 0x11ee
HT20/HT40
SM Power Save disabled
RX HT20 SGI
RX HT40 SGI
TX STBC
RX STBC 1-stream
Max AMSDU length: 3839 bytes DSSS/CCK HT40
Maximum RX AMPDU length 65535 bytes (exponent: 0x003) Minimum RX AMPDU time spacing: 8 usec (0x06) HT TX/RX MCS rate indexes supported: 0-15
HT operation:
* primary channel: 9
* secondary channel offset: above
* STA channel width: any
* RIFS: 0
* HT protection: no
* non-GF present: 0
* OBSS non-GF present: 0
* dual beacon: 0
* dual CTS protection: 0
* STBC beacon: 0
* L-SIG TXOP Prot: 0
* PCO active: 0
* PCO phase: 0
WMM: * Parameter version 1
* BE: CW 15-1023, AIFSN 3
* BK: CW 15-1023, AIFSN 7
* VI: CW 7-15, AIFSN 2, TXOP 3008 usec
* VO: CW 3-7, AIFSN 2, TXOP 1504 usec
Back on the AP, I played around and below is the output of some of the commands I ran that seemed to return useful information, as well as dmesg output. Many of the commands I tried either returned nothing or some error like "not supported". Do any of them give you the info you need? If not any other command you want me to run?
All this was done with the HT20/HT40 patch NOT applied.
thanks again for investigating this and all your dev efforts :-)
regards,
Eddie
root@DD-WRT:~# iwconfig ath0
ath0 IEEE 802.11bgn Mode:Master Frequency:2.452 GHz Tx-Power=17 dBm
Retry long limit:7 RTS thr:off Fragment thr:off
Power Management:offroot@DD-WRT:~# iwlist ath0 power ath0 Current mode:off
root@DD-WRT:~# iw ath0 info Interface ath0 ifindex 6 type AP wiphy 3
root@DD-WRT:~# iw phy0 info Wiphy phy0 Band 1: Capabilities: 0x11ee HT20/HT40 SM Power Save disabled RX HT20 SGI RX HT40 SGI TX STBC RX STBC 1-stream Max AMSDU length: 3839 bytes DSSS/CCK HT40 Maximum RX AMPDU length 65535 bytes (exponent: 0x003) Minimum RX AMPDU time spacing: 8 usec (0x06) HT TX/RX MCS rate indexes supported: 0-15 Frequencies: * 2412 MHz [1] (20.0 dBm) * 2417 MHz [2] (20.0 dBm) * 2422 MHz [3] (20.0 dBm) * 2427 MHz [4] (20.0 dBm) * 2432 MHz [5] (20.0 dBm) * 2437 MHz [6] (20.0 dBm) * 2442 MHz [7] (20.0 dBm) * 2447 MHz [8] (20.0 dBm) * 2452 MHz [9] (20.0 dBm) * 2457 MHz [10] (20.0 dBm) * 2462 MHz [11] (20.0 dBm) * 2467 MHz [12] (20.0 dBm) * 2472 MHz [13] (20.0 dBm) Bitrates (non-HT): * 1.0 Mbps * 2.0 Mbps (short preamble supported) * 5.5 Mbps (short preamble supported) * 11.0 Mbps (short preamble supported) * 6.0 Mbps * 9.0 Mbps * 12.0 Mbps * 18.0 Mbps * 24.0 Mbps * 36.0 Mbps * 48.0 Mbps * 54.0 Mbps max # scan SSIDs: 4 max scan IEs length: 2257 bytes Coverage class: 5 (up to 2250m) Supported Ciphers: * WEP40 (00-0f-ac:1) * WEP104 (00-0f-ac:5) * TKIP (00-0f-ac:2) * CCMP (00-0f-ac:4) * CMAC (00-0f-ac:6) Available Antennas: TX 0x3 RX 0x3 Configured Antennas: TX 0x3 RX 0x3 Supported interface modes: * IBSS * managed * AP * AP/VLAN * WDS * monitor * P2P-client * P2P-GO software interface modes (can always be added): * AP/VLAN * monitor interface combinations are not supported Supported commands: * new_interface * set_interface * new_key * new_beacon * new_station * set_bss * authenticate * associate * deauthenticate * disassociate * join_ibss * remain_on_channel * set_tx_bitrate_mask * action * frame_wait_cancel * set_wiphy_netns * set_channel * set_wds_peer * Unknown command (82) * Unknown command (81) * Unknown command (84) * Unknown command (87) * Unknown command (85) * connect * disconnect Supported TX frame types: * IBSS: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 * managed: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 * AP: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 * AP/VLAN: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 * mesh point: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 * P2P-client: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 * P2P-GO: 0x0000 0x0010 0x0020 0x0030 0x0040 0x0050 0x0060 0x0070 0x0080 0x0090 0x00a0 0x00b0 0x00c0 0x00d0 0x00e0 0x00f0 Supported RX frame types: * IBSS: 0x00d0 * managed: 0x0040 0x00d0 * AP: 0x0000 0x0020 0x0040 0x00a0 0x00b0 0x00c0 0x00d0 * AP/VLAN: 0x0000 0x0020 0x0040 0x00a0 0x00b0 0x00c0 0x00d0 * mesh point: 0x00b0 0x00c0 0x00d0 * P2P-client: 0x0040 0x00d0 * P2P-GO: 0x0000 0x0020 0x0040 0x00a0 0x00b0 0x00c0 0x00d0 Device supports RSN-IBSS. HT Capability overrides: * MCS: ff ff ff ff ff ff ff ff ff ff * maximum A-MSDU length * supported channel width * short GI for 40 MHz * max A-MPDU length exponent * min MPDU start spacing Device supports HT-IBSS.
root@DD-WRT:~# iw ath0 survey dump Survey data from ath0 frequency: 2412 MHz noise: -94 dBm channel active time: 51 ms channel busy time: 0 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2417 MHz noise: -94 dBm channel active time: 58 ms channel busy time: 0 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2422 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 12 ms channel receive time: 3 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2427 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 1 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2432 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 11 ms channel receive time: 2 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2437 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 1 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2442 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 4 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2447 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 8 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2452 MHz [in use] noise: -95 dBm channel active time: 244549336 ms channel busy time: 19353849 ms channel receive time: 1387651 ms channel transmit time: 10752120 ms Survey data from ath0 frequency: 2457 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 4 ms channel receive time: 0 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2462 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 17 ms channel receive time: 9 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2467 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 17 ms channel receive time: 6 ms channel transmit time: 0 ms Survey data from ath0 frequency: 2472 MHz noise: -95 dBm channel active time: 58 ms channel busy time: 16 ms channel receive time: 8 ms channel transmit time: 0 ms
root@DD-WRT:~# iwlist ath0 frequency
ath0 13 channels in total; available frequencies :
Channel 01 : 2.412 GHz
Channel 02 : 2.417 GHz
Channel 03 : 2.422 GHz
Channel 04 : 2.427 GHz
Channel 05 : 2.432 GHz
Channel 06 : 2.437 GHz
Channel 07 : 2.442 GHz
Channel 08 : 2.447 GHz
Channel 09 : 2.452 GHz
Channel 10 : 2.457 GHz
Channel 11 : 2.462 GHz
Channel 12 : 2.467 GHz
Channel 13 : 2.472 GHz
Current Frequency=2.452 GHz (Channel 9)Finally, here is dmesg output on the AP:
<5>[ 0.000000] Linux version 3.2.12-rc1-svn18774 (root@dd-wrt) (gcc version 4.6.3 20120201 (prerelease) (Linaro GCC 4.6-2012.02) ) #1482 Mon Mar 19 11:54:29 CET 2012 <4>[ 0.000000] flash_size passed from bootloader = 4 <6>[ 0.000000] bootconsole [early0] enabled <6>[ 0.000000] CPU revision is: 00019374 (MIPS 24Kc) <6>[ 0.000000] Determined physical RAM map: <6>[ 0.000000] memory: 02000000 @ 00000000 (usable) <4>[ 0.000000] Zone PFN ranges: <4>[ 0.000000] Normal 0x00000000 -> 0x00002000 <4>[ 0.000000] Movable zone start PFN for each node <4>[ 0.000000] early_node_map[1] active PFN ranges <4>[ 0.000000] 0: 0x00000000 -> 0x00002000 <7>[ 0.000000] On node 0 totalpages: 8192 <7>[ 0.000000] free_area_init_node: node 0, pgdat 8026e830, node_mem_map 81000000 <7>[ 0.000000] Normal zone: 64 pages used for memmap <7>[ 0.000000] Normal zone: 0 pages reserved <7>[ 0.000000] Normal zone: 8128 pages, LIFO batch:0 <7>[ 0.000000] pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768 <7>[ 0.000000] pcpu-alloc: [0] 0 <4>[ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 8128 <5>[ 0.000000] Kernel command line: console=ttyS0,115200 root=1f02 rootfstype=squashfs noinitrd init=/sbin/init <6>[ 0.000000] PID hash table entries: 128 (order: -3, 512 bytes) <6>[ 0.000000] Dentry cache hash table entries: 4096 (order: 2, 16384 bytes) <6>[ 0.000000] Inode-cache hash table entries: 2048 (order: 1, 8192 bytes) <4>[ 0.000000] Primary instruction cache 64kB, VIPT, 4-way, linesize 32 bytes. <4>[ 0.000000] Primary data cache 32kB, 4-way, VIPT, cache aliases, linesize 32 bytes <6>[ 0.000000] Writing ErrCtl register=00000000 <6>[ 0.000000] Readback ErrCtl register=00000000 <6>[ 0.000000] Memory: 29528k/32768k available (2081k kernel code, 3240k reserved, 402k data, 160k init, 0k highmem) <6>[ 0.000000] NR_IRQS:80 <6>[ 0.000000] Calibrating delay loop... 239.61 BogoMIPS (lpj=1198080) <6>[ 0.070000] pid_max: default: 32768 minimum: 301 <6>[ 0.070000] Mount-cache hash table entries: 512 <6>[ 0.080000] NET: Registered protocol family 16 <6>[ 0.100000] found calibration data for slot 0 on 0xBF3F1000 <4>[ 0.310000] registering PCI controller with io_map_base unset <6>[ 0.330000] bio: create slab <bio-0> at 0 <7>[ 0.330000] pci 0000:00:00.0: [168c:ff1c] type 0 class 0x000200 <6>[ 0.330000] pci 0000:00:00.0: fixup device configuration <0>[ 0.340000] bootstrap returns device 168C:2E <7>[ 0.340000] pci 0000:00:00.0: reg 10: [mem 0x00000000-0x0000ffff 64bit] <7>[ 0.340000] pci 0000:00:00.0: supports D1 <7>[ 0.340000] pci 0000:00:00.0: PME# supported from D0 D1 D3hot <7>[ 0.340000] pci 0000:00:00.0: PME# disabled <6>[ 0.340000] pci 0000:00:00.0: BAR 0: assigned [mem 0x10000000-0x1000ffff 64bit] <6>[ 0.350000] pci 0000:00:00.0: BAR 0: set to [mem 0x10000000-0x1000ffff 64bit] (PCI address [0x10000000-0x1000ffff]) <6>[ 0.360000] PCI: mapping irq 72 to pin1@0000:00:00.0 <6>[ 0.360000] Switching to clocksource MIPS <6>[ 0.370000] NET: Registered protocol family 2 <6>[ 0.370000] IP route cache hash table entries: 1024 (order: 0, 4096 bytes) <6>[ 0.380000] TCP established hash table entries: 1024 (order: 1, 8192 bytes) <6>[ 0.390000] TCP bind hash table entries: 1024 (order: 0, 4096 bytes) <6>[ 0.390000] TCP: Hash tables configured (established 1024 bind 1024) <6>[ 0.400000] TCP reno registered <6>[ 0.400000] UDP hash table entries: 256 (order: 0, 4096 bytes) <6>[ 0.410000] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes) <6>[ 0.420000] NET: Registered protocol family 1 <7>[ 0.420000] PCI: CLS 0 bytes, default 32 <5>[ 0.420000] gpio_proc: module loaded and /proc/gpio/ created <5>[ 0.430000] wl0gpio_proc: module loaded and /proc/wl0gpio/ created <6>[ 0.440000] squashfs: version 3.0 (2006/03/15) Phillip Lougher <6>[ 0.440000] msgmni has been set to 57 <6>[ 0.450000] io scheduler noop registered <6>[ 0.450000] io scheduler deadline registered (default) <6>[ 0.460000] Serial: 8250/16550 driver, 1 ports, IRQ sharing disabled <6>[ 0.480000] serial8250.0: ttyS0 at MMIO 0x18020000 (irq = 11) is a 16550A <6>[ 0.490000] console [ttyS0] enabled, bootconsole disabled <0>[ 0.500000] guessed flashsize = 4M <0>[ 0.510000] scanning for root partition <0>[ 0.510000] WNR2000 uboot detected <0>[ 0.510000] guessed bootloader size = 50000 <0>[ 0.520000] <0>[ 0.520000] found squashfs at 150000 <5>[ 0.530000] Creating 8 MTD partitions on "ar7240-nor0": <5>[ 0.530000] 0x000000000000-0x000000050000 : "RedBoot" <5>[ 0.540000] 0x000000050000-0x0000003e0000 : "linux" <5>[ 0.550000] 0x000000150000-0x0000003e0000 : "rootfs" <5>[ 0.550000] mtd: partition "rootfs" set to be root filesystem <5>[ 0.560000] 0x0000003e0000-0x000000400000 : "ddwrt" <5>[ 0.570000] 0x0000003e0000-0x0000003f0000 : "nvram" <5>[ 0.570000] 0x0000003f0000-0x000000400000 : "board_config" <5>[ 0.580000] 0x000000000000-0x000000400000 : "fullflash" <5>[ 0.590000] 0x000000000000-0x000000050000 : "fullboot" <6>[ 0.600000] tun: Universal TUN/TAP device driver, 1.6 <6>[ 0.600000] tun: (C) 1999-2004 Max Krasnyansky <[email protected]> <6>[ 1.010000] PPP generic driver version 2.4.2 <6>[ 1.010000] PPP BSD Compression module registered <6>[ 1.020000] PPP Deflate Compression module registered <6>[ 1.020000] PPP MPPE Compression module registered <6>[ 1.030000] NET: Registered protocol family 24 <6>[ 1.030000] Software Watchdog Timer: 0.07 initialized. soft_noboot=0 soft_margin=60 sec soft_panic=0 (nowayout= 0) <7>[ 1.040000] Registered led device: generic_0 <7>[ 1.040000] Registered led device: generic_1 <7>[ 1.050000] Registered led device: generic_2 <7>[ 1.050000] Registered led device: generic_3 <7>[ 1.050000] Registered led device: generic_4 <7>[ 1.050000] Registered led device: generic_5 <7>[ 1.050000] Registered led device: generic_6 <7>[ 1.050000] Registered led device: generic_7 <7>[ 1.050000] Registered led device: generic_8 <7>[ 1.050000] Registered led device: generic_9 <7>[ 1.050000] Registered led device: generic_10 <7>[ 1.050000] Registered led device: generic_11 <7>[ 1.050000] Registered led device: generic_12 <7>[ 1.050000] Registered led device: generic_13 <7>[ 1.050000] Registered led device: generic_14 <7>[ 1.050000] Registered led device: generic_15 <7>[ 1.050000] Registered led device: generic_16 <7>[ 1.050000] Registered led device: generic_17 <7>[ 1.050000] Registered led device: generic_18 <7>[ 1.050000] Registered led device: generic_19 <7>[ 1.050000] Registered led device: generic_20 <7>[ 1.050000] Registered led device: generic_21 <7>[ 1.050000] Registered led device: generic_22 <7>[ 1.050000] Registered led device: generic_23 <7>[ 1.050000] Registered led device: generic_24 <7>[ 1.050000] Registered led device: generic_25 <7>[ 1.050000] Registered led device: generic_26 <7>[ 1.050000] Registered led device: generic_27 <7>[ 1.050000] Registered led device: generic_28 <7>[ 1.050000] Registered led device: generic_29 <7>[ 1.060000] Registered led device: generic_30 <7>[ 1.060000] Registered led device: generic_31 <7>[ 1.060000] Registered led device: wireless_generic_0 <7>[ 1.060000] Registered led device: wireless_generic_1 <7>[ 1.060000] Registered led device: wireless_generic_2 <7>[ 1.060000] Registered led device: wireless_generic_3 <7>[ 1.060000] Registered led device: wireless_generic_4 <7>[ 1.060000] Registered led device: wireless_generic_5 <7>[ 1.060000] Registered led device: wireless_generic_6 <7>[ 1.060000] Registered led device: wireless_generic_7 <7>[ 1.060000] Registered led device: wireless_generic_8 <7>[ 1.060000] Registered led device: wireless_generic_9 <7>[ 1.060000] Registered led device: wireless_generic_10 <7>[ 1.060000] Registered led device: wireless_generic_11 <7>[ 1.060000] Registered led device: wireless_generic_12 <7>[ 1.060000] Registered led device: wireless_generic_13 <7>[ 1.060000] Registered led device: wireless_generic_14 <7>[ 1.060000] Registered led device: wireless_generic_15 <6>[ 1.060000] u32 classifier <6>[ 1.060000] input device check on <6>[ 1.070000] Actions configured <6>[ 1.070000] Netfilter messages via NETLINK v0.30. <6>[ 1.080000] nf_conntrack version 0.5.0 (461 buckets, 1844 max) <4>[ 1.080000] nf_conntrack_rtsp v0.6.21 loading <4>[ 1.090000] nf_nat_rtsp v0.6.21 loading <6>[ 1.090000] ip_tables: (C) 2000-2006 Netfilter Core Team <6>[ 1.100000] IPP2P v0.8.2 loading <6>[ 1.100000] TCP westwood registered <6>[ 1.100000] TCP hybla registered <6>[ 1.110000] TCP vegas registered <6>[ 1.110000] NET: Registered protocol family 17 <6>[ 1.120000] 8021q: 802.1Q VLAN Support v1.8 <6>[ 1.120000] searching for nvram <6>[ 1.120000] nvram size = 0 <6>[ 1.160000] VFS: Mounted root (squashfs filesystem) readonly on device 31:2. <6>[ 1.170000] Freeing unused kernel memory: 160k freed <6>[ 4.250000] ag71xx_mdio: probed <6>[ 4.250000] eth0: Atheros AG71xx at 0xb9000000, irq 4 <7>[ 4.850000] eth0: connected to PHY at ag71xx-mdio.1:04 [uid=004dd041, driver=Generic PHY] <6>[ 4.850000] eth1: Atheros AG71xx at 0xba000000, irq 5 <6>[ 5.440000] eth1: Found an AR7240/AR9330 built-in switch <6>[ 5.730000] Compat-wireless backport release: compat-wireless-2012-02-23-9-g3e5b1f0 <6>[ 5.730000] Backport based on wireless-testing.git master-2012-02-27 <6>[ 5.910000] cfg80211: Calling CRDA to update world regulatory domain <6>[ 6.300000] cfg80211: World regulatory domain updated: <6>[ 6.310000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) <6>[ 6.320000] cfg80211: (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 6.320000] cfg80211: (2457000 KHz - 2482000 KHz @ 20000 KHz), (300 mBi, 2000 mBm) <6>[ 6.330000] cfg80211: (2474000 KHz - 2494000 KHz @ 20000 KHz), (300 mBi, 2000 mBm) <6>[ 6.340000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 6.350000] cfg80211: (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 6.590000] eth1: link up (1000Mbps/Full duplex) <7>[ 6.780000] PCI: Setting latency timer of device 0000:00:00.0 to 64 <3>[ 6.780000] ath: eeprom contains invalid mac address: ff:ff:ff:ff:ff:ff <3>[ 6.790000] ath: random mac address will be used: 42:83:03:c5:15:55 <7>[ 6.800000] ath: EEPROM regdomain: 0x0 <7>[ 6.800000] ath: EEPROM indicates default country code should be used <7>[ 6.800000] ath: doing EEPROM country->regdmn map search <7>[ 6.800000] ath: country maps to regdmn code: 0x3a <7>[ 6.800000] ath: Country alpha2 being used: US <7>[ 6.800000] ath: Regpair used: 0x3a <7>[ 6.810000] ieee80211 phy0: Selected rate control algorithm 'minstrel_ht' <7>[ 6.810000] Registered led device: ath9k-phy0 <6>[ 6.810000] ieee80211 phy0: Atheros AR9287 Rev:2 mem=0xb0000000, irq=72 <6>[ 6.820000] cfg80211: Calling CRDA for country: US <6>[ 6.940000] cfg80211: Regulatory domain changed to country: US <6>[ 6.950000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) <6>[ 6.960000] cfg80211: (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2700 mBm) <6>[ 6.970000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 1700 mBm) <6>[ 6.970000] cfg80211: (5250000 KHz - 5330000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 6.980000] cfg80211: (5490000 KHz - 5600000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 6.990000] cfg80211: (5650000 KHz - 5710000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 7.000000] cfg80211: (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 3000 mBm) <6>[ 9.010000] device eth0 entered promiscuous mode <6>[ 9.020000] eth1: link down <6>[ 9.090000] device eth1 entered promiscuous mode <6>[ 9.180000] cfg80211: Calling CRDA to update world regulatory domain <6>[ 9.210000] eth1: link up (1000Mbps/Full duplex) <6>[ 9.210000] br0: port 2(eth1) entering forwarding state <6>[ 9.220000] br0: port 2(eth1) entering forwarding state <6>[ 9.230000] cfg80211: World regulatory domain updated: <6>[ 9.230000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) <6>[ 9.240000] cfg80211: (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 9.250000] cfg80211: (2457000 KHz - 2482000 KHz @ 20000 KHz), (300 mBi, 2000 mBm) <6>[ 9.260000] cfg80211: (2474000 KHz - 2494000 KHz @ 20000 KHz), (300 mBi, 2000 mBm) <6>[ 9.260000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 9.270000] cfg80211: (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) <6>[ 9.280000] cfg80211: Calling CRDA for country: GB <6>[ 9.300000] cfg80211: Regulatory domain changed to country: GB <6>[ 9.310000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) <6>[ 9.320000] cfg80211: (2402000 KHz - 2482000 KHz @ 40000 KHz), (N/A, 2000 mBm) <6>[ 9.320000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (N/A, 2000 mBm) <6>[ 9.330000] cfg80211: (5250000 KHz - 5330000 KHz @ 40000 KHz), (N/A, 2000 mBm) <6>[ 9.340000] cfg80211: (5490000 KHz - 5710000 KHz @ 40000 KHz), (N/A, 2700 mBm) <6>[ 11.220000] br0: port 2(eth1) entering forwarding state <6>[ 30.490000] device ath0 entered promiscuous mode <6>[ 30.490000] br0: port 3(ath0) entering forwarding state <6>[ 30.500000] br0: port 3(ath0) entering forwarding state <6>[ 32.420000] device ath0.1 entered promiscuous mode <6>[ 32.420000] br0: port 4(ath0.1) entering forwarding state <6>[ 32.430000] br0: port 4(ath0.1) entering forwarding state <6>[ 32.500000] br0: port 3(ath0) entering forwarding state <6>[ 32.810000] device eth1 left promiscuous mode <6>[ 32.810000] br0: port 2(eth1) entering forwarding state <6>[ 32.890000] device eth1.2 entered promiscuous mode <6>[ 32.890000] device eth1 entered promiscuous mode <6>[ 32.900000] br0: port 2(eth1.2) entering forwarding state <6>[ 32.900000] br0: port 2(eth1.2) entering forwarding state <6>[ 32.970000] device eth1.6 entered promiscuous mode <6>[ 32.970000] br1: port 1(eth1.6) entering forwarding state <6>[ 32.980000] br1: port 1(eth1.6) entering forwarding state <6>[ 32.990000] device ath0.1 left promiscuous mode <6>[ 33.000000] br0: port 4(ath0.1) entering forwarding state <6>[ 33.010000] device ath0.1 entered promiscuous mode <6>[ 33.020000] br1: port 2(ath0.1) entering forwarding state <6>[ 33.020000] br1: port 2(ath0.1) entering forwarding state <6>[ 34.900000] br0: port 2(eth1.2) entering forwarding state <6>[ 48.000000] br1: port 1(eth1.6) entering forwarding state <6>[ 48.040000] br1: port 2(ath0.1) entering forwarding state
Hi Eddie,
Quoted 6 lines
The AP is a Netgear WNR2000v3 running DD-WRT v24-sp2 (03/19/12) std.
After sshing into it and playing around with the iw command, the phy is phy0 and the device is ath0.
"iw ath0 scan dump" returns nothing unfortunately.
Yeah, sorry, I guess I confused you. I did want this info from the client, as you provided:
Quoted 4 lines
In case it helps, on the laptop (the client) I do get output from "iw wlan0 scan dump":
BSS 82:e1:fa:1a:65:00 (on wlan0) -- associated
[...]
Quoted 3 lines
HT operation:
* primary channel: 9
* secondary channel offset: above
As you can see, it's using HT40+ on channel 9 (2452 MHz). Your HT40 allow (correctly) map showed:
2452 HT40 -
This is because HT40+ isn't actually allowed on channel 9 by the standard (cf. 802.11-2012 Table E-1 (US), E-2 (Europe), E-3 (Japan).
I wonder, what is the oldest kernel you tried? I think the fact that we can connect here was introduced by some older patch, and then reverted by my patch, so older kernels should have been slower as well?
The problem here is that some devices (notably iwlwifi) will not allow (by firmware) to connect to such an AP as HT40- if that is not allowed. So I prevented it generally, but we can make it device dependent. I don't like it much, but I suppose we can do it. Try this patch:
http://p.sipsolutions.net/0129f39c7d882289.txt
It will still prohibit this configuration when the driver said it's not allowed, but will allow it when there were other reasons to not allow it.
johannes
Quoted 21 lines · Johannes Berg
Hi Eddie,
Quoted 6 lines
The AP is a Netgear WNR2000v3 running DD-WRT v24-sp2 (03/19/12) std.
After sshing into it and playing around with the iw command, the phy is phy0 and the device is ath0.
"iw ath0 scan dump" returns nothing unfortunately.
Yeah, sorry, I guess I confused you. I did want this info from the client, as you provided:
Quoted 4 lines
In case it helps, on the laptop (the client) I do get output from "iw wlan0 scan dump":
BSS 82:e1:fa:1a:65:00 (on wlan0) -- associated
[...]
Quoted 3 lines
HT operation:
* primary channel: 9
* secondary channel offset: above
Quoted 7 lines
As you can see, it's using HT40+ on channel 9 (2452 MHz). Your HT40 allow (correctly) map showed:
2452 HT40 -
This is because HT40+ isn't actually allowed on channel 9 by the standard (cf. 802.11-2012 Table E-1 (US), E-2 (Europe), E-3 (Japan).
I've just realised what's going on. Not being too knowledgeable about wireless I had no idea what HT20 and HT40 and the patch was about. Now when I look at the AP web interface, I see a drop down box for "Channel Width", with the options being:
Quarter (5MHz)
Half (10MHz)
Full (20MHz)
Turbo (40MHz)
Dynamic (20/40MHz)
and "Turbo" is selected. It doesn't say "HT" anywhere, but I'm guessing this setting is actually the HT setting and I have it set to 40 where it should be 20? It must be something I changed when setting the AP up, not understanding what it did. Perhaps I should set it to Dynamic.
Quoted 3 lines
I wonder, what is the oldest kernel you tried? I think the fact that we can connect here was introduced by some older patch, and then reverted by my patch, so older kernels should have been slower as well?
I've had this AP like this with the "Turbo" setting for a good few months, and had excellent throughput (around 4 or 5 Mbyte/s) on a mixture of kernels on my laptop the whole time; Fedora 15 with a 3.0 kernel (which they named 2.6.40), and then Gentoo using various 3.4 and 3.6 kernels. Only on upgrading to 3.6.5 was the first time throughput dropped. I've also had an Android phone and another Windows XP laptop connecting to this AP without any problems, though never measured throughput with them so can't say if they have ever suffered.
Quoted 10 lines
The problem here is that some devices (notably iwlwifi) will not allow (by firmware) to connect to such an AP as HT40- if that is not allowed. So I prevented it generally, but we can make it device dependent. I don't like it much, but I suppose we can do it. Try this patch:
http://p.sipsolutions.net/0129f39c7d882289.txt
It will still prohibit this configuration when the driver said it's not allowed, but will allow it when there were other reasons to not allow it.
OK, so I'll try re applying the HT20/HT40 patch in 3.6.5, and then applying the above patch, and report back.
thanks,
Eddie
Quoted 6 lines · Johannes Berg
Quoted 1 line
BSS 82:e1:fa:1a:65:00 (on wlan0) -- associated
[...]
Quoted 3 lines
HT operation:
* primary channel: 9
* secondary channel offset: above
Quoted 7 lines
As you can see, it's using HT40+ on channel 9 (2452 MHz). Your HT40 allow (correctly) map showed:
2452 HT40 -
This is because HT40+ isn't actually allowed on channel 9 by the standard (cf. 802.11-2012 Table E-1 (US), E-2 (Europe), E-3 (Japan).
Oops, no, that is obviously wrong. This is permitted outside the US, and that is reflected in those tables as well (I was confused). However, your AP isn't transmitting any info on where it is, and your device is set up for world roaming (country is "00" rather than a real country). Thus, channel 13 isn't allowed and you can't do HT40+ on channel 9.
johannes
Quoted 13 lines · Johannes Berg
Quoted 11 lines · Johannes Berg
Quoted 1 line
BSS 82:e1:fa:1a:65:00 (on wlan0) -- associated
[...]
Quoted 3 lines
HT operation:
* primary channel: 9
* secondary channel offset: aboveAs you can see, it's using HT40+ on channel 9 (2452 MHz). Your HT40 allow (correctly) map showed:
2452 HT40 -
Quoted 8 lines
Quoted 2 lines
This is because HT40+ isn't actually allowed on channel 9 by the standard (cf. 802.11-2012 Table E-1 (US), E-2 (Europe), E-3 (Japan).
Oops, no, that is obviously wrong. This is permitted outside the US, and that is reflected in those tables as well (I was confused). However, your AP isn't transmitting any info on where it is, and your device is set up for world roaming (country is "00" rather than a real country). Thus, channel 13 isn't allowed and you can't do HT40+ on channel 9.
Here's another idea. I'm not sure if you're running CRDA, but you could try this patch:
http://p.sipsolutions.net/8877cbe3440d94b1.txt
and see if "iw reg get" changes like this:
country 00:
(2402 - 2472 @ 40), (6, 20)
- (2457 - 2482 @ 20), (6, 20), PASSIVE-SCAN, NO-IBSS
+ (2457 - 2482 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS
(2474 - 2494 @ 20), (6, 20), NO-OFDM, PASSIVE-SCAN, NO-IBSS
(5170 - 5250 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS
(5735 - 5835 @ 40), (6, 20), PASSIVE-SCAN, NO-IBSS
(57240 - 63720 @ 2160), (N/A, 0)If yes, then your problem will likely go away, if no you'd need an updated regulatory database for CRDA. +Luis, what do you think?
johannes
Hi Johannes,
Quoted 13 lines · Johannes Berg
Quoted 11 lines · Johannes Berg
Quoted 1 line
BSS 82:e1:fa:1a:65:00 (on wlan0) -- associated
[...]
Quoted 3 lines
HT operation:
* primary channel: 9
* secondary channel offset: aboveAs you can see, it's using HT40+ on channel 9 (2452 MHz). Your HT40 allow (correctly) map showed:
2452 HT40 -
Quoted 8 lines
Quoted 2 lines
This is because HT40+ isn't actually allowed on channel 9 by the standard (cf. 802.11-2012 Table E-1 (US), E-2 (Europe), E-3 (Japan).
Oops, no, that is obviously wrong. This is permitted outside the US, and that is reflected in those tables as well (I was confused). However, your AP isn't transmitting any info on where it is, and your device is set up for world roaming (country is "00" rather than a real country). Thus, channel 13 isn't allowed and you can't do HT40+ on channel 9.
In the AP's dmesg output which I included in my other message, I see this:
<6>[ 9.300000] cfg80211: Regulatory domain changed to country: GB
So it seems the AP knows where it is, but is it not transmitting that to the client?
Eddie
Hi Eddie,
Quoted 6 lines
In the AP's dmesg output which I included in my other message, I see this:
<6>[ 9.300000] cfg80211: Regulatory domain changed to country: GBSo it seems the AP knows where it is, but is it not transmitting that to the client?
Evidently, I don't see a country IE in the iw scan output you posted.
johannes
Quoted 10 lines · Johannes Berg
Hi Eddie,
Quoted 6 lines
In the AP's dmesg output which I included in my other message, I see this:
<6>[ 9.300000] cfg80211: Regulatory domain changed to country: GBSo it seems the AP knows where it is, but is it not transmitting that to the client?
Evidently, I don't see a country IE in the iw scan output you posted.
Then again, what version of iw do you have? This only applies if it's version 0.9.20 or higher.
johannes
Quoted 10 lines · Johannes Berg
Quoted 9 lines · Johannes Berg
Hi Eddie,
Quoted 6 lines
In the AP's dmesg output which I included in my other message, I see this:
<6>[ 9.300000] cfg80211: Regulatory domain changed to country: GBSo it seems the AP knows where it is, but is it not transmitting that to the client?
Quoted 6 lines
Quoted 1 line
Evidently, I don't see a country IE in the iw scan output you posted.
Then again, what version of iw do you have? This only applies if it's version 0.9.20 or higher.
johannes
I don't see a country specified in the output I sent you either. We're talking about iw scan on the client right, not the AP?
Over on the AP, I just looked in the web interface, and there is a drop down box for "Regulatory Domain", and I have it set to "United Kingdom".
as for iw version on the client it says:
nc6400 ~ # iw --version
iw version 3.3
You mentioned crda, it seems gentoo has it, I can install it on the client if you think it will help in figuring this out?
nc6400 ~ # emerge --search crda
Searching...
[ Results for search key : crda ]
[ Applications found : 1 ]
* net-wireless/crda
Latest version available: 1.1.2-r3
Latest version installed: [ Not Installed ]
Size of files: 21 kB
Homepage: http://wireless.kernel.org/en/developers/Regulatory
Description: Central Regulatory Domain Agent for wireless networks.
License: as-is
Quoted 10 lines · Eddie Chapman
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
So it seems the AP knows where it is, but is it not transmitting that to the client?
Evidently, I don't see a country IE in the iw scan output you posted.
Then again, what version of iw do you have? This only applies if it's version 0.9.20 or higher.
I don't see a country specified in the output I sent you either. We're talking about iw scan on the client right, not the AP?
Yes. The scan on the client shows the AP's information, after all.
Quoted 2 lines
Over on the AP, I just looked in the web interface, and there is a drop down box for "Regulatory Domain", and I have it set to "United Kingdom".
Right. It just doesn't seem to tell the client for some reason.
Quoted 2 lines
nc6400 ~ # iw --version
iw version 3.3
Right, ok. That would print the country information if it was there.
Quoted 2 lines
You mentioned crda, it seems gentoo has it, I can install it on the client if you think it will help in figuring this out?
No, I think actually *not* having it might be more helpful, although once we have found the (different) solution(s) we'll have to make sure we fix it in all possible places, including crda/regdb.
johannes
Quoted 10 lines · Johannes Berg
The problem here is that some devices (notably iwlwifi) will not allow (by firmware) to connect to such an AP as HT40- if that is not allowed. So I prevented it generally, but we can make it device dependent. I don't like it much, but I suppose we can do it. Try this patch:
http://p.sipsolutions.net/0129f39c7d882289.txt
It will still prohibit this configuration when the driver said it's not allowed, but will allow it when there were other reasons to not allow it.
Just to report, with the patch under discussion re-applied (3a40414f826a8f1096d9b94c4a53ef91b25ba28d), plus the patch at your link above, my throughput is back to normal again.
So I guess the above patch resolves the issue (on the face of it) for me, but whether it is a suitable solution I've no idea.
Eddie
Quoted 8 lines · Eddie Chapman
Quoted 7 lines · Johannes Berg
The problem here is that some devices (notably iwlwifi) will not allow (by firmware) to connect to such an AP as HT40- if that is not allowed. So I prevented it generally, but we can make it device dependent. I don't like it much, but I suppose we can do it. Try this patch:
Quoted 7 lines
Quoted 3 lines
It will still prohibit this configuration when the driver said it's not allowed, but will allow it when there were other reasons to not allow it.
Just to report, with the patch under discussion re-applied (
3a40414f826a8f1096d9b94c4a53ef91b25ba28d), plus the patch at your link above, my throughput is back to normal again.
Ok, thanks.
Quoted 2 lines
So I guess the above patch resolves the issue (on the face of it) for me, but whether it is a suitable solution I've no idea.
Right, we're still looking at that. It seems that it's not an ideal solution, the regulatory change I proposed is probably better. Could you check if it helps as well? That is, remove this patch, and apply this
one: http://p.sipsolutions.net/8877cbe3440d94b1.txt
johannes
Quoted 19 lines · Johannes Berg
Quoted 8 lines · Eddie Chapman
Quoted 7 lines · Johannes Berg
The problem here is that some devices (notably iwlwifi) will not allow (by firmware) to connect to such an AP as HT40- if that is not allowed. So I prevented it generally, but we can make it device dependent. I don't like it much, but I suppose we can do it. Try this patch:
Quoted 7 lines
Quoted 3 lines
It will still prohibit this configuration when the driver said it's not allowed, but will allow it when there were other reasons to not allow it.
Just to report, with the patch under discussion re-applied (
3a40414f826a8f1096d9b94c4a53ef91b25ba28d), plus the patch at your link above, my throughput is back to normal again.Ok, thanks.
Quoted 7 lines
Quoted 2 lines
So I guess the above patch resolves the issue (on the face of it) for me, but whether it is a suitable solution I've no idea.
Right, we're still looking at that. It seems that it's not an ideal solution, the regulatory change I proposed is probably better. Could you check if it helps as well? That is, remove this patch, and apply this
one: http://p.sipsolutions.net/8877cbe3440d94b1.txt
OK, so I've removed 0129f39c7d882289.txt, applied 8877cbe3440d94b1.txt, and I've kept 3a40414f826a8f1096d9b94c4a53ef91b25ba28d applied.
Rebooted, and happy to report throughput is still good, so 8877cbe3440d94b1.txt also "fixes" it for me.
Eddie
Quoted 10 lines · Eddie Chapman
Quoted 4 lines
Right, we're still looking at that. It seems that it's not an ideal solution, the regulatory change I proposed is probably better. Could you check if it helps as well? That is, remove this patch, and apply this
one: http://p.sipsolutions.net/8877cbe3440d94b1.txtOK, so I've removed 0129f39c7d882289.txt, applied 8877cbe3440d94b1.txt, and I've kept
3a40414f826a8f1096d9b94c4a53ef91b25ba28dapplied.Rebooted, and happy to report throughput is still good, so 8877cbe3440d94b1.txt also "fixes" it for me.
Great, thanks. I'm not really sure which one to apply, and if we apply the 8877 one we'll also want to update the reg db (that you aren't using). A lot of people are in Barcelona right now though, so that might be a week or so until we can close this.
Thanks for all the testing!
johannes
Quoted 10 lines · Johannes Berg
Quoted 8 lines · Eddie Chapman
Quoted 4 lines
Right, we're still looking at that. It seems that it's not an ideal solution, the regulatory change I proposed is probably better. Could you check if it helps as well? That is, remove this patch, and apply this
one: http://p.sipsolutions.net/8877cbe3440d94b1.txtOK, so I've removed 0129f39c7d882289.txt, applied 8877cbe3440d94b1.txt, and I've kept
3a40414f826a8f1096d9b94c4a53ef91b25ba28dapplied.
Quoted 7 lines
Quoted 2 lines
Rebooted, and happy to report throughput is still good, so 8877cbe3440d94b1.txt also "fixes" it for me.
Great, thanks. I'm not really sure which one to apply, and if we apply the 8877 one we'll also want to update the reg db (that you aren't using). A lot of people are in Barcelona right now though, so that might be a week or so until we can close this.
No hurry at all from my point of view.
Quoted 1 line
Thanks for all the testing!
Not at all, it's a pleasure to be able to contribute in some tiny way to kernel development.
Greg KH
maintainerQuoted 10 lines · Johannes Berg
Quoted 8 lines · Eddie Chapman
Quoted 4 lines
Right, we're still looking at that. It seems that it's not an ideal solution, the regulatory change I proposed is probably better. Could you check if it helps as well? That is, remove this patch, and apply this
one: http://p.sipsolutions.net/8877cbe3440d94b1.txtOK, so I've removed 0129f39c7d882289.txt, applied 8877cbe3440d94b1.txt, and I've kept
3a40414f826a8f1096d9b94c4a53ef91b25ba28dapplied.
Quoted 7 lines
Quoted 2 lines
Rebooted, and happy to report throughput is still good, so 8877cbe3440d94b1.txt also "fixes" it for me.
Great, thanks. I'm not really sure which one to apply, and if we apply the 8877 one we'll also want to update the reg db (that you aren't using). A lot of people are in Barcelona right now though, so that might be a week or so until we can close this.
I'm in Barcelona all this week, but a nice summary of what I'm supposed to do here for the stable tree would be great to have when ever you figure it out, don't wait for me to return, my email queues up just fine :)
thanks,
greg k-h
Quoted 8 lines · Greg KH
Quoted 4 lines
Great, thanks. I'm not really sure which one to apply, and if we apply the 8877 one we'll also want to update the reg db (that you aren't using). A lot of people are in Barcelona right now though, so that might be a week or so until we can close this.
I'm in Barcelona all this week, but a nice summary of what I'm supposed to do here for the stable tree would be great to have when ever you figure it out, don't wait for me to return, my email queues up just fine :)
Sure :)
So first of all, I'm sure (even without Eddie having tested it) that the bug affects 3.7-rc as well, not just 3.6 stable, since the same patch was applied there. Therefore, we're looking for a fix for that as well.
There are two possible fixes (that I can think of right now), both of which Eddie tested.
One is a change to my old change, to make it only adhere to the regulatory rules that the *driver* asked for, which will still fix the iwlwifi problem of crashing the firmware in situations like Eddie's. However, it's a bit strange to be ignoring our regulatory rules.
The other fix is a relaxation of the regulatory rules to allow 40 MHz operation involving channels 12 and 13 (like in Eddie's setup, where channel 9 HT40+ is used, which means the effective channel spans from the bottom of channel 6 to the top of channel 13.) This seems like a much cleaner solution, but the change needs to be done in two places (both the kernel's idea of the "world roaming" regulatory domain, and userspace's).
I prefer the second fix, but want to run it by somebody more familiar with regulatory rules.
Ultimately, I'll apply either one for 3.7, and tag it with Cc stable.
johannes
Greg KH
maintainerQuoted 32 lines · Johannes Berg
Quoted 8 lines · Greg KH
Quoted 4 lines
Great, thanks. I'm not really sure which one to apply, and if we apply the 8877 one we'll also want to update the reg db (that you aren't using). A lot of people are in Barcelona right now though, so that might be a week or so until we can close this.
I'm in Barcelona all this week, but a nice summary of what I'm supposed to do here for the stable tree would be great to have when ever you figure it out, don't wait for me to return, my email queues up just fine :)
Sure :)
So first of all, I'm sure (even without Eddie having tested it) that the bug affects 3.7-rc as well, not just 3.6 stable, since the same patch was applied there. Therefore, we're looking for a fix for that as well.There are two possible fixes (that I can think of right now), both of which Eddie tested.
One is a change to my old change, to make it only adhere to the regulatory rules that the *driver* asked for, which will still fix the iwlwifi problem of crashing the firmware in situations like Eddie's. However, it's a bit strange to be ignoring our regulatory rules.
The other fix is a relaxation of the regulatory rules to allow 40 MHz operation involving channels 12 and 13 (like in Eddie's setup, where channel 9 HT40+ is used, which means the effective channel spans from the bottom of channel 6 to the top of channel 13.) This seems like a much cleaner solution, but the change needs to be done in two places (both the kernel's idea of the "world roaming" regulatory domain, and userspace's).
Quoted 4 lines
I prefer the second fix, but want to run it by somebody more familiar with regulatory rules.
Ultimately, I'll apply either one for 3.7, and tag it with Cc stable.
Wonderful, thanks for the summary, and the work on this, I'll just take it through the normal cc: stable process.
greg k-h