Felix Fietkau 9db372fdd5 mac80211: fix channel type recalculation with HT and non-HT interfaces ...

When running an AP interface along with the cooked monitor interface created
by hostapd, adding an interface and deleting it again triggers a channel type
recalculation during which the (non-HT) monitor interface takes precedence
over the HT AP interface, thus causing the channel type to be set to non-HT.
Fix this by ensuring that a more wide channel type will not be overwritten
by a less wide channel type.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2011-03-14 14:46:58 -04:00

..

9p

net/9p: Use proper data types

2011-01-11 09:58:07 -06:00

802

…

8021q

8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues

2010-11-28 10:47:19 -08:00

appletalk

…

atm

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2011-01-07 16:58:04 -08:00

ax25

net: ax25: fix information leak to userland harder

2011-01-12 00:34:49 -08:00

batman-adv

batman-adv: Return hna count on local buffer fill

2010-12-20 10:32:03 -08:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

2011-03-04 13:59:44 -05:00

bridge

net: bridge: check the length of skb after nf_bridge_maybe_copy_header()

2011-01-06 11:33:05 -08:00

caif

CAIF: Fix IPv6 support in receive path for GPRS/3G

2011-01-10 16:12:00 -08:00

can

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-01-04 11:57:25 -08:00

ceph

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

2011-01-13 10:25:24 -08:00

core

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

2011-01-14 13:25:30 -08:00

dcb

dcb: use after free in dcb_flushapp()

2011-01-06 11:16:54 -08:00

dccp

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

2011-01-13 10:05:56 -08:00

decnet

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

2011-01-13 10:05:56 -08:00

dns_resolver

Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:10 -08:00

dsa

net/dsa: don't use flush_scheduled_work()

2010-12-24 15:59:06 +01:00

econet

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-17 12:27:22 -08:00

ethernet

eth: fix new kernel-doc warning

2011-01-12 19:00:40 -08:00

ieee802154

net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()

2010-12-08 10:07:24 -08:00

ipv4

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

2011-01-13 10:05:56 -08:00

ipv6

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

2011-01-14 13:25:30 -08:00

ipx

…

irda

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-26 22:37:05 -08:00

iucv

[S390] irq: have detailed statistics for interrupt types

2011-01-05 12:47:25 +01:00

key

…

l2tp

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

lapb

Net: lapb: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:14 -08:00

llc

net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()

2010-12-08 10:07:24 -08:00

mac80211

mac80211: fix channel type recalculation with HT and non-HT interfaces

2011-03-14 14:46:58 -04:00

netfilter

netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()

2011-01-13 17:03:39 +01:00

netlabel

net: kill unused macros

2010-12-19 21:59:35 -08:00

netlink

netlink: test for all flags of the NLM_F_DUMP composite

2011-01-09 16:25:03 -08:00

netrom

…

packet

net: Use skb_checksum_start_offset()

2010-12-16 14:43:14 -08:00

phonet

phonet: some signedness bugs

2011-01-10 13:33:17 -08:00

rds

Net: rds: Makefile: Remove deprecated items

2010-11-22 08:16:15 -08:00

rfkill

…

rose

…

rxrpc

rxrpc: rxrpc_workqueue isn't used during memory reclaim

2011-01-14 09:25:11 -08:00

sched

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

2011-01-14 13:25:30 -08:00

sctp

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-17 12:27:22 -08:00

sunrpc

Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux

2011-01-14 13:17:26 -08:00

tipc

tipc: update log.h re-include protection to reflect new name

2011-01-01 14:56:18 -08:00

unix

af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.

2011-01-05 15:38:53 -08:00

wanrouter

Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:16 -08:00

wimax

…

wireless

wireless: add support for ethtool_ops->{get,set}_ringparam

2011-03-11 14:16:58 -05:00

x25

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

xfrm

xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC

2011-01-11 14:03:09 -08:00

compat.c

…

Kconfig

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

2011-01-13 10:05:56 -08:00

Makefile

net: Add batman-adv meshing protocol

2010-12-16 13:44:24 -08:00

nonet.c

…

socket.c

pass default dentry_operations to mount_pseudo()

2011-01-12 20:03:43 -05:00

sysctl_net.c

…

TUNABLE

…