diff options
author | Dan Murphy | 2013-05-08 13:36:01 -0500 |
---|---|---|
committer | Dan Murphy | 2013-05-08 13:36:01 -0500 |
commit | 1c1c1e66b5dc8ae89a416d1da5118900cd15219f (patch) | |
tree | 64c670d11dee77df94cd2c93ee86c637281b137a /net | |
parent | 935f6c2f82056d538b528272e2bdbb5c08d69a58 (diff) | |
parent | 9c9ab76c48ffc48648c8e5da40d57965fc65c030 (diff) | |
download | kernel-video-1c1c1e66b5dc8ae89a416d1da5118900cd15219f.tar.gz kernel-video-1c1c1e66b5dc8ae89a416d1da5118900cd15219f.tar.xz kernel-video-1c1c1e66b5dc8ae89a416d1da5118900cd15219f.zip |
Merge tag 'v3.8.12' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.8.y
* tag 'v3.8.12' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (104 commits)
Linux 3.8.12
mfd: adp5520: Restore mode bits on resume
rcutrace: single_open() leaks
mmc: atmel-mci: pio hang on block errors
mmc: core: Fix bit width test failing on old eMMC cards
x86: Eliminate irq_mis_count counted in arch_irq_stat
KVM: X86 emulator: fix source operand decoding for 8bit mov[zs]x instructions
Give the OID registry file module info to avoid kernel tainting
mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload
ext4: fix Kconfig documentation for CONFIG_EXT4_DEBUG
ext4: fix online resizing for ext3-compat file systems
ext4: fix big-endian bug in metadata checksum calculations
ext4: fix journal callback list traversal
jbd2: fix race between jbd2_journal_remove_checkpoint and ->j_commit_callback
ext4/jbd2: don't wait (forever) for stale tid caused by wraparound
ixgbe: fix EICR write in ixgbe_msix_other
ipc: sysv shared memory limited to 8TiB
wireless: regulatory: fix channel disabling race condition
nfsd: Decode and send 64bit time values
nfsd: don't run get_file if nfs4_preprocess_stateid_op return error
...
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/pm.c | 4 | ||||
-rw-r--r-- | net/wireless/reg.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index e45b83610e8..a179bf8d1ea 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
@@ -51,8 +51,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) | |||
51 | ieee80211_stop_queues_by_reason(hw, | 51 | ieee80211_stop_queues_by_reason(hw, |
52 | IEEE80211_QUEUE_STOP_REASON_SUSPEND); | 52 | IEEE80211_QUEUE_STOP_REASON_SUSPEND); |
53 | 53 | ||
54 | /* flush out all packets */ | 54 | /* flush out all packets and station cleanup call_rcu()s */ |
55 | synchronize_net(); | 55 | rcu_barrier(); |
56 | 56 | ||
57 | drv_flush(local, false); | 57 | drv_flush(local, false); |
58 | 58 | ||
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index de02d633c21..ecf56638996 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -855,7 +855,7 @@ static void handle_channel(struct wiphy *wiphy, | |||
855 | return; | 855 | return; |
856 | 856 | ||
857 | REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq); | 857 | REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq); |
858 | chan->flags = IEEE80211_CHAN_DISABLED; | 858 | chan->flags |= IEEE80211_CHAN_DISABLED; |
859 | return; | 859 | return; |
860 | } | 860 | } |
861 | 861 | ||