Johannes Berg fcb6ff5e2c iwlwifi: disable WoWLAN if !CONFIG_PM_SLEEP ...

If CONFIG_PM_SLEEP is disabled, then iwlwifi doesn't
support suspend/resume handlers and thus mac80211
(correctly) refuses advertising WoWLAN. Disable
WoWLAN in the driver in this case.

Cc: stable@kernel.org
Reported-by: Sebastian Kemper <sebastian_ml@gmx.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2012-06-04 15:27:07 -04:00

..

accessibility

…

acpi

x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c

2012-05-30 10:12:48 -07:00

amba

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:22:27 -07:00

ata

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

atm

solos-pci: Fix DMA support

2012-05-24 16:22:53 -04:00

auxdisplay

…

base

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-06-01 10:34:35 -07:00

bcma

bcma: add ext PA workaround for BCM4331 and BCM43431

2012-06-04 15:26:40 -04:00

block

mtip32xx: Changes to sysfs entries

2012-05-31 08:46:50 +02:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-05-24 11:54:29 -07:00

cdrom

…

char

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

2012-05-24 12:42:54 -07:00

clk

Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 13:05:55 -07:00

clocksource

…

connector

…

cpufreq

…

cpuidle

…

crypto

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

dca

…

devfreq

Merge tag 'pm-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-05-23 14:07:06 -07:00

dio

…

dma

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:57:47 -07:00

edac

Merge branch 'x86/trampoline' into x86/urgent

2012-05-30 12:11:32 -07:00

eisa

…

extcon

Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-05-22 16:02:13 -07:00

firewire

Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

2012-05-24 12:57:47 -07:00

firmware

…

gpio

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-05-29 18:27:19 -07:00

gpu

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

2012-06-01 15:40:29 -07:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

hsi

…

hv

Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-05-22 16:02:13 -07:00

hwmon

hwmon/sch56xx: Depend on watchdog for watchdog core functions

2012-05-30 07:56:20 +02:00

hwspinlock

…

i2c

i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING

2012-05-30 10:55:34 +02:00

ide

…

idle

…

ieee802154

…

iio

…

infiniband

Merge tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2012-05-21 17:54:55 -07:00

input

i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING

2012-05-30 10:55:34 +02:00

iommu

Merge tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2012-05-30 08:49:28 -07:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-05-24 11:54:29 -07:00

leds

leds: add LM3533 LED driver

2012-05-29 16:22:32 -07:00

lguest

…

macintosh

…

md

Merge tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm

2012-06-02 17:39:40 -07:00

media

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

memory

…

memstick

…

message

Merge branch 'akpm' (Andrew's patch-bomb)

2012-05-31 18:10:18 -07:00

mfd

ARM: ux500: Provide regulator support for SMSC911x via Device Tree

2012-06-01 02:04:46 +02:00

misc

Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-05-29 11:53:11 -07:00

mmc

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:57:47 -07:00

mtd

Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

2012-06-01 16:55:42 -07:00

net

iwlwifi: disable WoWLAN if !CONFIG_PM_SLEEP

2012-06-04 15:27:07 -04:00

nfc

NFC: potential integer overflow problem in check_crc()

2012-05-25 11:16:16 -04:00

nubus

…

of

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-05-29 18:27:19 -07:00

oprofile

…

parisc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

parport

Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2012-05-22 16:02:13 -07:00

pci

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2012-05-29 18:27:19 -07:00

pcmcia

…

pinctrl

pinctrl-nomadik: Allow Device Tree driver probing

2012-06-01 02:03:25 +02:00

platform

apple-gmux: Fix up the suspend/resume patch

2012-06-01 15:18:52 -04:00

pnp

…

power

Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6

2012-05-31 12:10:15 -07:00

pps

…

ps3

…

ptp

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

rapidio

rapidio/tsi721: add DMA engine support

2012-05-31 17:49:31 -07:00

regulator

Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2012-05-29 11:53:11 -07:00

remoteproc

Merge tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2012-05-30 08:49:28 -07:00

rpmsg

…

rtc

drivers/rtc/rtc-s3c.c: fix compiler warning

2012-05-29 16:22:34 -07:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-05-31 10:51:10 -07:00

sbus

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2012-05-31 12:02:41 -07:00

sfi

…

sh

sh: intc: Kill off special reservation interface.

2012-05-22 19:07:55 +09:00

sn

…

spi

Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 13:05:55 -07:00

ssb

…

staging

mm/fs: route MADV_REMOVE to FALLOC_FL_PUNCH_HOLE

2012-05-29 16:22:22 -07:00

target

Merge branch 'sbp-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2012-05-23 16:52:27 -07:00

tc

…

thermal

…

tty

tty: Revert the tty locking series, it needs more work

2012-06-02 15:21:43 -07:00

uio

…

usb

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

uwb

…

vhost

…

video

Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

2012-06-01 16:57:51 -07:00

virt

…

virtio

virtio-mmio: Devices parameter parsing

2012-05-22 12:16:15 +09:30

vlynq

…

vme

…

w1

Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:42:29 -07:00

watchdog

watchdog: iTCO_wdt.c: fix printk format warnings

2012-05-30 08:16:48 +02:00

xen

Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-29 20:14:53 -07:00

zorro

…

Kconfig

Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2012-05-22 16:34:21 -07:00

Makefile

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-05-26 12:22:27 -07:00