Johannes Berg
9a418af5df
mac80211: fix peer HT capabilities ...
I noticed yesterday, because Jeff had noticed
a speed regression, cf. bug
http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2138
that the SM PS settings for peers were wrong.
Instead of overwriting the SM PS settings with
the local bits, we need to keep the remote bits.
The bug was part of the original HT code from
over two years ago, but unfortunately nobody
noticed that it makes no sense -- we shouldn't
be overwriting the peer's setting with our own
but rather keep it intact when masking the peer
capabilities with our own.
While fixing that, I noticed that the masking of
capabilities is completely useless for most of
the bits, so also fix those other bits.
Finally, I also noticed that PSMP_SUPPORT no
longer exists in the final 802.11n version, so
also remove that.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-12-21 11:32:27 -05:00
ARM: 5720/1: Move MMCI header to amba include dir
2009-09-22 20:49:04 +01:00
can: Driver for the Microchip MCP251x SPI CAN controllers
2009-11-08 01:50:21 -08:00
MFD: TWL4030: Add audio_mclk to the codec platform data
2009-11-22 10:09:12 -08:00
Merge branch 'for-2.6.32' of git://linux-nfs.org/~bfields/linux
2009-09-22 07:54:33 -07:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2009-12-08 08:12:43 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2009-11-18 22:19:03 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
2009-12-03 13:23:12 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
seq_file: constify seq_operations
2009-09-23 07:39:29 -07:00
regulator/driver: be more specific in nanodoc for is_enabled
2009-09-22 13:32:45 +01:00
wl1251: add NVS in EEPROM support
2009-11-18 17:09:24 -05:00
ssb: Put host pointers into a union
2009-10-27 16:47:55 -04:00
sunrpc: xdr_xcode_hyper helpers cannot presume 64-bit alignment
2009-09-23 14:36:38 -04:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
include/linux/unaligned/{l,b}e_byteshift.h: fix usage for compressed kernels
2009-09-24 07:21:05 -07:00
usbnet & cdc-ether: Autosuspend for online devices
2009-12-03 15:31:18 -08:00
wimax/i6x50: add Intel WiFi/WiMAX Link 6050 Series support
2009-10-19 15:55:59 +09:00
const: mark struct vm_struct_operations
2009-09-27 11:39:25 -07:00
anonfd: split interface into file creation and install
2009-09-23 07:39:29 -07:00
libata: Clarify ata_set_lba_range_entries function
2009-12-03 18:01:23 -05:00
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
block: move bdi/address_space unplug functions to backing-dev.h
2009-10-29 13:59:26 +01:00
backlight: Allow drivers to update the core, and generate events on changes
2009-09-21 21:03:58 +01:00
exec: fix set_binfmt() vs sys_delete_module() race
2009-09-24 07:21:01 -07:00
block: add helpers to run flush_dcache_page() against a bio and a request's pages
2009-11-26 09:16:19 +01:00
block: Allow devices to indicate whether discarded blocks are zeroed
2009-12-03 09:24:48 +01:00
Add a tracepoint for block request remapping
2009-10-01 21:19:34 +02:00
bootmem: Add free_bootmem_late()
2009-11-10 12:31:43 +01:00
tg3 / broadcom: Optionally disable TXC if no link
2009-11-02 23:39:15 -08:00
remove CONFIG_SECURITY_FILE_CAPABILITIES compile option
2009-11-24 15:06:47 +11:00
const: constify remaining file_operations
2009-10-01 16:11:11 -07:00
blkio: Introduce blkio controller cgroup interface
2009-12-03 19:28:51 +01:00
proc connector: add event for process becoming session leader
2009-09-23 07:39:29 -07:00
net/compat_ioctl: support SIOCWANDEV
2009-11-08 20:57:03 -08:00
compiler: Introduce __always_unused
2009-11-02 15:47:54 +01:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:32:03 -08:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:32:03 -08:00
docs: fix various Documentation/ paths in header files
2009-09-24 07:20:57 -07:00
drbd: moved CN_IDX_DRBD and CN_VAL_DRBD to the right file
2009-11-25 17:57:36 +01:00
cpufreq: add cpufreq_get() stub for CONFIG_CPU_FREQ=n
2009-10-29 07:39:24 -07:00
cpumask: Move deprecated functions to end of header.
2009-09-24 09:34:53 +09:30
include/linux/cred.h: fix build
2009-09-23 11:01:25 -07:00
TCPCT part 1b: generate Responder Cookie secret
2009-12-02 22:07:23 -08:00
docs: fix various Documentation/ paths in header files
2009-09-24 07:20:57 -07:00
Driver core: allow certain drivers prohibit bind/unbind via sysfs
2009-10-30 14:59:51 -07:00
x86: intel-iommu: Convert detect_intel_iommu to use iommu_init hook
2009-11-10 12:31:36 +01:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
drbd: moved CN_IDX_DRBD and CN_VAL_DRBD to the right file
2009-11-25 17:57:36 +01:00
change default: by default, use socket buffer auto tuning
2009-11-04 15:20:57 +01:00
The DRBD driver
2009-10-01 21:17:49 +02:00
The DRBD driver
2009-10-01 21:17:49 +02:00
[S390] 64-bit register support for 31-bit processes
2009-10-06 10:35:10 +02:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
tg3: Add some VPD preprocessor constants
2009-12-03 13:18:04 -08:00
anonfd: split interface into file creation and install
2009-09-23 07:39:29 -07:00
ext3: Wait for proper transaction commit on fsync
2009-11-11 15:22:49 +01:00
fb: remove fb_save_state() and fb_restore_state operations
2009-11-12 07:25:56 -08:00
net 03/05: fib_rules: add oif classification
2009-12-03 12:14:36 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
firewire: ohci: 0 may be a valid DMA address
2009-10-31 11:40:51 +01:00
flex_array: introduce DEFINE_FLEX_ARRAY
2009-09-22 07:17:47 -07:00
block: Allow devices to indicate whether discarded blocks are zeroed
2009-12-03 09:24:48 +01:00
CacheFiles: Catch an overly long wait for an old active object
2009-11-19 18:12:05 +00:00
FS-Cache: Handle pages pending storage that get evicted under OOM conditions
2009-11-19 18:11:35 +00:00
tracing: correct module boundaries for ftrace_release
2009-10-07 15:52:09 -04:00
tracing: Use the perf recursion protection from trace event
2009-11-22 09:03:42 +01:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-10-08 12:16:35 -07:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
block: Expose discard granularity
2009-11-10 11:50:21 +01:00
BUILD_BUG_ON(): fix it and a couple of bogus uses of it
2009-09-23 07:39:29 -07:00
GFS2: Tag all metadata with jid
2009-12-03 11:58:47 +00:00
gigaset: documentation amendments
2009-12-08 20:30:41 -08:00
gpiolib: allow exported GPIO nodes to be named using sysfs links
2009-09-23 07:39:46 -07:00
rcu: "Tiny RCU", The Bloatwatch Edition
2009-10-26 09:40:29 +01:00
const: mark struct vm_struct_operations
2009-09-27 11:39:25 -07:00
hw-breakpoints: Use struct perf_event_attr to define kernel breakpoints
2009-11-27 06:22:59 +01:00
i2c: i2c-pnx: Made buf type unsigned to prevent sign extension
2009-11-20 00:25:42 +00:00
i2c: Drop probe, ignore and force module parameters
2009-12-06 17:06:24 +01:00
znet: fix build failure from i82593.h relocation
2009-11-17 10:16:32 -05:00
mac80211: fix peer HT capabilities
2009-12-21 11:32:27 -05:00
cfg80211: disallow bridging managed/adhoc interfaces
2009-11-19 11:08:54 -05:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
include/linux/if_ether.h: Remove unused defines MAC_BUF_SIZE and DECLARE_MAC_BUF
2009-12-08 20:42:28 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
macvlan: export macvlan mode through netlink
2009-11-26 15:53:10 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
vlan: support "loose binding" to the underlying network device
2009-11-26 16:00:36 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
ipv4 05/05: add sysctl to accept packets with local source addresses
2009-12-03 12:14:38 -08:00
initcalls: Add early_initcall() for modules
2009-10-02 15:42:19 +02:00
remove CONFIG_SECURITY_FILE_CAPABILITIES compile option
2009-11-24 15:06:47 +11:00
Input: add new keycodes useful in mobile devices
2009-11-22 10:09:30 -08:00
irq: Remove unused debug_poll_all_shared_irqs()
2009-11-04 14:22:21 +01:00
block: Fix io_context leak after failure of clone with CLONE_IO
2009-12-04 16:36:18 +01:00
walk system ram range
2009-09-23 07:39:41 -07:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
headers: kref.h redux
2009-09-26 10:17:19 -07:00
inet: rename some inet_sock fields
2009-10-18 18:52:53 -07:00
irq: trivial: Fix typo in comment for #endif
2009-10-23 08:28:10 +02:00
Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation."
2009-11-15 22:23:47 -08:00
jbd.h: bitfields should be unsigned
2009-09-23 07:39:58 -07:00
jbd2: Use tracepoints for history file
2009-09-30 00:32:06 -04:00
sched, time: Define nsecs_to_jiffies()
2009-11-26 12:59:20 +01:00
Merge branch 'master' into next
2009-12-03 12:03:40 +05:30
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 09:50:22 -08:00
sched, cpuacct: Fix niced guest time accounting
2009-10-25 17:31:30 +01:00
BUILD_BUG_ON(): fix it and a couple of bogus uses of it
2009-09-23 07:39:29 -07:00
Merge commit 'linus/master' into tracing/kprobes
2009-09-23 23:08:43 +02:00
headers: kref.h redux
2009-09-26 10:17:19 -07:00
ksm: clean up obsolete references
2009-09-22 07:17:33 -07:00
KVM: s390: Make psw available on all exits, not just a subset
2009-12-03 09:32:25 +02:00
KVM: introduce kvm_vcpu_on_spin
2009-12-03 09:32:17 +02:00
libata: add private driver field to struct ata_device
2009-12-03 14:36:18 -05:00
lis3: add free-fall/wakeup function via platform_data
2009-09-22 07:17:48 -07:00
The DRBD driver
2009-10-01 21:17:49 +02:00
security: report the module name to security_module_request
2009-11-10 09:33:46 +11:00
ramfs: move RAMFS_MAGIC to include/linux/magic.h
2009-09-23 07:39:42 -07:00
memory controller: soft limit reclaim on contention
2009-09-24 07:20:59 -07:00
walk system ram range
2009-09-23 07:39:41 -07:00
mm: remove broken 'kzalloc' mempool
2009-09-22 07:17:35 -07:00
trivial: fix typos "man[ae]g?ment" -> "management"
2009-09-21 15:14:56 +02:00
NOMMU: Fallback for is_vmalloc_or_module_addr() should be inline
2009-09-24 17:20:20 -07:00
mm: return boolean from page_is_file_cache()
2009-09-22 07:17:37 -07:00
const: mark struct vm_struct_operations
2009-09-27 11:39:25 -07:00
mm: move use_mm/unuse_mm from aio.c to mm/
2009-09-22 07:17:42 -07:00
ksm: add mmu_notifier set_pte_at_notify()
2009-09-22 07:17:31 -07:00
sysctl: remove "struct file *" argument of ->proc_handler
2009-09-24 07:21:04 -07:00
spi: prefix modalias with "spi:"
2009-09-23 07:39:43 -07:00
module: preferred way to use MODULE_AUTHOR
2009-09-25 00:32:58 +09:30
param: fix lots of bugs with writing charp params from sysfs, by leaking mem.
2009-10-29 08:56:17 +10:30
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2009-12-05 15:22:26 -08:00
netdevice: provide common routine for macvlan and vlan operstate management
2009-12-03 15:59:22 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
Merge branch 'for-2.6.32' of git://linux-nfs.org/~bfields/linux
2009-09-22 07:54:33 -07:00
headers: kref.h redux
2009-09-26 10:17:19 -07:00
nilfs2: deleted struct nilfs_dat_group_desc
2009-11-15 17:17:38 +09:00
nl80211: PMKSA caching support
2009-11-28 15:05:05 -05:00
ieee802154: add support for creation/removal of logic interfaces
2009-11-06 14:32:24 +03:00
net: NETDEV_UNREGISTER_PERNET -> NETDEV_UNREGISTER_BATCH
2009-12-01 16:15:50 -08:00
of: merge of_find_all_nodes() implementations
2009-10-15 10:58:09 -06:00
of: merge other miscellaneous prototypes
2009-10-15 10:58:07 -06:00
oom: move oom_killer_enable()/oom_killer_disable to where they belong
2009-09-22 07:17:38 -07:00
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
2009-09-24 07:53:22 -07:00
memcg: remove the overhead associated with the root cgroup
2009-09-24 07:20:58 -07:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
2009-12-08 08:18:01 -08:00
Merge branches 'perf/powerpc' and 'perf/bench' into perf/core
2009-11-15 09:51:24 +01:00
perf_events: Undo some recursion damage
2009-11-23 11:49:57 +01:00
Phonet: error on broadcast sending (unimplemented)
2009-09-24 15:38:57 -07:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
PM: Add flag for devices capable of generating run-time wake-up events
2009-12-06 16:17:57 +01:00
PM: Add flag for devices capable of generating run-time wake-up events
2009-12-06 16:17:57 +01:00
pnp: add a shutdown method to pnp drivers
2009-09-22 07:17:49 -07:00
flex_array: poison free elements
2009-09-22 07:17:47 -07:00
headers: remove sched.h from poll.h
2009-10-04 15:05:10 -07:00
VFS: Add forget_all_cached_acls()
2009-12-03 11:43:23 +00:00
HWPOISON: Clean up PR_MCE_KILL interface
2009-10-04 03:23:17 +02:00
sched: Revert 498657a478
2009-12-02 09:55:33 +01:00
kcore: register vmemmap range
2009-09-23 07:39:41 -07:00
VFS: Export dquot_send_warning
2009-12-03 11:53:02 +00:00
const: make struct super_block::s_qcop const
2009-09-22 07:17:24 -07:00
const: mark struct vm_struct_operations
2009-09-27 11:39:25 -07:00
ratelimit: Make suppressed output messages more useful
2009-10-23 17:26:37 +02:00
netdev: add netdev_continue_rcu
2009-11-10 22:26:29 -08:00
rcu: Re-arrange code to reduce #ifdef pain
2009-11-22 18:58:16 +01:00
rcu: Re-arrange code to reduce #ifdef pain
2009-11-22 18:58:16 +01:00
rcu: Re-arrange code to reduce #ifdef pain
2009-11-22 18:58:16 +01:00
RDS: Add GET_MR_FOR_DEST sockopt
2009-10-30 15:06:37 -07:00
docs: fix various Documentation/ paths in header files
2009-09-24 07:20:57 -07:00
memcg: some modification to softlimit under hierarchical memory reclaim.
2009-10-01 16:11:13 -07:00
rfkill: Add constant for RFKILL_TYPE_FM radio devices
2009-11-18 17:09:26 -05:00
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
2009-09-24 07:53:22 -07:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
net: cleanup include/linux
2009-11-04 09:50:58 -08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:30:49 -08:00
sctp: implement definition for SACK-IMMEDIATELY extension
2009-11-23 15:53:52 -05:00
define convenient securebits masks for prctl users (v2)
2009-10-30 08:27:25 +11:00
security: report the module name to security_module_request
2009-11-10 09:33:46 +11:00
vfs: seq_file: add helpers for data filling
2009-09-24 07:47:35 -04:00
sparc: Support for GRLIB APBUART serial port
2009-11-04 08:44:54 -08:00
signals: introduce do_send_sig_info() helper
2009-09-24 07:21:01 -07:00
skbuff: remove skb_dma_map/unmap
2009-12-02 19:57:15 -08:00
SLOW_WORK: Move slow_work's proc file to debugfs
2009-12-01 08:20:31 -08:00
generic-ipi: Add smp_call_function_any()
2009-11-18 14:52:25 +01:00
tracing: Pushdown the bkl tracepoints calls
2009-09-28 18:00:48 +02:00
net: smsc911x: allow platform_data to specify mac address
2009-10-13 11:48:32 -07:00
net,socket: introduce DECLARE_SOCKADDR helper to catch overflow at build time
2009-10-29 03:00:06 -07:00
locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
2009-11-24 14:41:13 +01:00
locking: Make inlining decision Kconfig based
2009-11-13 20:53:28 +01:00
rcu: Add synchronize_srcu_expedited()
2009-10-26 09:40:30 +01:00
strstrip(): mark as as must_check
2009-10-29 07:39:25 -07:00
mm: allow memory hotplug and hibernation in the same kernel
2009-11-17 17:40:33 -08:00
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
2009-09-24 07:53:22 -07:00
swiotlb: Remove duplicate swiotlb_force extern declarations
2009-11-15 09:03:10 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-12-08 07:55:01 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-12-08 07:55:01 -08:00
TCPCT part 1d: define TCP cookie option, extend existing struct's
2009-12-02 22:07:25 -08:00
time: add function to convert between calendar time and broken-down time for universal use
2009-09-24 07:20:56 -07:00
sched: Disable SD_PREFER_LOCAL for MC/CPU domains
2009-10-14 15:02:34 +02:00
tpm: fix header for modular build
2009-10-29 11:17:40 +11:00
tracing: Remove cpu arg from the rb_time_stamp() function
2009-10-24 11:07:51 +02:00
signals: tracehook_notify_jctl change
2009-09-24 07:21:00 -07:00
events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()
2009-11-26 09:04:55 +01:00
tty: Fix regressions caused by commit b50989dc
2009-09-27 13:35:16 -07:00
mfd/gpio: add a GPIO interface to the UCB1400 MFD chip driver via gpiolib
2009-09-23 07:39:48 -07:00
udp: bind() optimisation
2009-11-10 20:54:38 -08:00
USB: make intf.pm_usage an atomic_t
2009-09-23 06:46:23 -07:00
USB: usbfs: add USBDEVFS_URB_BULK_CONTINUATION flag
2009-09-23 06:46:39 -07:00
core: Fix user return notifier on fork()
2009-11-29 22:03:04 +01:00
headers: utsname.h redux
2009-09-23 18:13:10 -07:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2009-09-24 09:57:08 -07:00
virtio: make add_buf return capacity remaining
2009-09-23 22:26:31 +09:30
virtio: let header files include virtio_ids.h
2009-10-22 16:39:28 +10:30
virtio: let header files include virtio_ids.h
2009-10-22 16:39:28 +10:30
virtio_blk: Revert serial number support
2009-10-22 16:39:30 +10:30
BUILD_BUG_ON(): fix it and a couple of bogus uses of it
2009-09-23 07:39:29 -07:00
virtio: let header files include virtio_ids.h
2009-10-22 16:39:28 +10:30
virtio: add virtio IDs file
2009-09-23 22:26:32 +09:30
virtio: let header files include virtio_ids.h
2009-10-22 16:39:28 +10:30
virtio: let header files include virtio_ids.h
2009-10-22 16:39:28 +10:30
mm: count only reclaimable lru pages
2009-09-22 07:17:30 -07:00
vt: Fix use of "new" in a struct field
2009-11-19 13:43:06 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-09-23 03:49:27 +04:00
workqueue: add 'flush_delayed_work()' to run and wait for delayed work
2009-10-14 09:16:42 -07:00
writeback: introduce wbc.for_background
2009-12-03 13:54:25 +01:00
X25: Enable setting of cause and diagnostic fields
2009-11-18 23:30:41 -08:00
xfrm: Define new XFRM netlink auth attribute with specified truncation bits
2009-11-25 15:48:37 -08:00
