John W. Linville 819386dfc6 Revert "mac80211: fix rates setup on IBSS merge" ...

I accidentally merged an incomplete version of the patch...

This reverts commit b4d59a9317e41faec3d0b6a03f0454d1e8abb710.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

2010-03-16 15:05:23 -04:00

..

9p

9p: fix p9_client_destroy unconditional calling v9fs_put_trans

2010-02-08 18:18:34 -06:00

802

sysctl net: Remove unused binary sysctl code

2009-11-12 02:05:06 -08:00

8021q

percpu: add __percpu sparse annotations to net

2010-02-16 23:05:38 -08:00

appletalk

net: appletalk: use seq_hlist_foo() helpers

2010-02-10 11:12:09 -08:00

atm

net: atm: use seq_list_foo() helpers

2010-02-10 12:31:10 -08:00

ax25

net: ax25: use seq_hlist_foo() helpers

2010-02-10 11:12:09 -08:00

bluetooth

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

bridge

bridge: Fix build error when IGMP_SNOOPING is not enabled

2010-03-02 03:05:04 -08:00

can

can: deny filterlist access on non-CAN interfaces

2010-02-02 07:21:34 -08:00

core

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

dcb

const: struct nla_policy

2010-02-18 14:30:18 -08:00

dccp

percpu: add __percpu sparse annotations to net

2010-02-16 23:05:38 -08:00

decnet

net: Add checking to rcu_dereference() primitives

2010-02-25 09:41:03 +01:00

dsa

netdev: convert pseudo-devices to netdev_tx_t

2009-09-01 01:13:07 -07:00

econet

net: use net_eq to compare nets

2009-11-25 15:14:13 -08:00

ethernet

llc: use dev_hard_header

2009-12-26 20:38:23 -08:00

ieee802154

net: use net_eq to compare nets

2009-11-25 15:14:13 -08:00

ipv4

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

ipv6

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

2010-02-26 09:31:09 -08:00

ipx

net: ipx: use seq_list_foo() helpers

2010-02-10 12:31:10 -08:00

irda

const: struct nla_policy

2010-02-18 14:30:18 -08:00

iucv

const: constify remaining dev_pm_ops

2009-12-15 08:53:25 -08:00

key

xfrm: SP lookups signature with mark

2010-02-22 16:21:12 -08:00

lapb

net: remove NET_RX_BAD and NET_RX_CN* defines

2009-07-05 19:15:35 -07:00

llc

llc: fix SAP reference counting w.r.t. socket handling

2009-12-26 20:47:23 -08:00

mac80211

Revert "mac80211: fix rates setup on IBSS merge"

2010-03-16 15:05:23 -04:00

netfilter

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

2010-02-26 09:31:09 -08:00

netlabel

net: remove INIT_RCU_HEAD() usage

2010-02-17 00:03:27 -08:00

netlink

netlink: Adding inode field to /proc/net/netlink

2010-02-28 01:29:49 -08:00

netrom

net: netrom: use seq_hlist_foo() helpers

2010-02-10 11:12:08 -08:00

packet

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

phonet

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

rds

net/rds: remove uses of NIPQUAD, use %pI4

2010-02-03 20:16:48 -08:00

rfkill

enhance sysfs rfkill interface

2010-03-10 17:09:34 -05:00

rose

net: rose: use seq_hlist_foo() helpers

2010-02-10 11:12:08 -08:00

rxrpc

net: use net_eq to compare nets

2009-11-25 15:14:13 -08:00

sched

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

2010-02-09 11:44:44 -08:00

sctp

net: remove INIT_RCU_HEAD() usage

2010-02-17 00:03:27 -08:00

sunrpc

net: Fix first line of kernel-doc for a few functions

2010-02-14 22:35:47 -08:00

tipc

tipc: Clean up configuration file

2010-01-19 14:23:57 -08:00

unix

AF_UNIX: update locking comment

2010-02-18 14:12:06 -08:00

wanrouter

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

wimax

const: struct nla_policy

2010-02-18 14:30:18 -08:00

wireless

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

2010-02-25 23:26:21 -08:00

x25

X25: Dont let x25_bind use addresses containing characters

2010-02-15 21:49:52 -08:00

xfrm

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

compat.c

net: use compat helper functions in compat_sys_recvmmsg

2009-12-11 15:07:57 -08:00

Kconfig

net/compat/wext: send different messages to compat tasks

2009-07-15 08:53:39 -07:00

Makefile

net: remove redundant sched/ in net/Makefile

2009-07-12 20:11:14 -07:00

nonet.c

…

socket.c

fs: no games with DCACHE_UNHASHED

2009-12-17 10:51:40 -05:00

sysctl_net.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

TUNABLE

…