David S. Miller e62f77579c Merge tag 'master-2014-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... John W. Linville says: ==================== pull request: wireless 2014-07-24 Please pull this batch of fixes intended for the 3.16 stream... For the mac80211 fixes, Johannes says: "I have two fixes: one for tracing that fixes a long-standing NULL pointer dereference, and one for a mac80211 issue that causes iwlmvm to send invalid frames during authentication/association." and, "One more fix - for a bug in the newly introduced code that obtains rate control information for stations." For the iwlwifi fixes, Emmanuel says: "It includes a merge damage fix. This region has been changed in -next and -fixes quite a few times and apparently, I failed to handle it properly, so here the fix. Along with that I have a fix from Eliad to properly handle overlapping BSS in AP mode." On top of that, Felix provides and ath9k fix for Tx stalls that happen after an aggregation session failure. Please let me know if there are problems! There are some changes here that will cause merge conflicts in -next. Once you merge this I can pull it into wireless-next and resolve those issues. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-24 23:22:15 -07:00
..
9p	A bunch of updates and cleanup within the transport layer,	2014-04-11 14:14:57 -07:00
802	neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.	2014-01-16 11:31:58 -08:00
8021q	vlan: free percpu stats in device destructor	2014-07-02 17:02:05 -07:00
appletalk	appletalk: Fix socket referencing in skb	2014-07-08 19:39:43 -07:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
ax25	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
batman-adv	batman-adv: fix TT VLAN inconsistency on VLAN re-add	2014-07-21 09:49:30 +02:00
bluetooth	Bluetooth: Fix for ACL disconnect when pairing fails	2014-06-20 13:53:54 +02:00
bridge	bridge: fix compile error when compiling without IPv6 support	2014-06-12 11:00:24 -07:00
caif	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
can	can: add hash based access to single EFF frame filters	2014-05-19 09:38:24 +02:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2014-06-12 23:06:23 -07:00
core	net-gre-gro: Fix a bug that breaks the forwarding path	2014-07-16 14:45:26 -07:00
dcb	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
dccp	net: Eliminate no_check from protosw	2014-05-23 16:28:53 -04:00
decnet	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
dns_resolver	dns_resolver: Null-terminate the right string	2014-07-20 22:33:32 -07:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
ethernet	net: eth_type_trans() should use skb_header_pointer()	2014-01-16 15:30:31 -08:00
hsr	hsr: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
ieee802154	6lowpan_rtnl: fix off by one while fragmentation	2014-06-02 10:39:42 -07:00
ipv4	ipv4: fix buffer overflow in ip_options_compile()	2014-07-21 20:16:26 -07:00
ipv6	net-gre-gro: Fix a bug that breaks the forwarding path	2014-07-16 14:45:26 -07:00
ipx	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
irda	net: add build-time checks for msg->msg_name size	2014-01-18 23:04:16 -08:00
iucv	af_iucv: correct cleanup if listen backlog is full	2014-05-30 17:35:23 -07:00
key	af_key: Replace comma with semicolon	2014-05-30 17:48:58 -07:00
l2tp	net/l2tp: don't fall back on UDP [get|set]sockopt	2014-07-14 17:02:31 -07:00
lapb
llc	llc: remove noisy WARN from llc_mac_hdr_init	2014-01-28 18:01:32 -08:00
mac80211	mac80211: fix crash on getting sta info with uninitialized rate control	2014-07-22 22:17:17 +02:00
mac802154	mac802154: don't deliver packets to devices that are down	2014-06-11 12:10:19 -07:00
mpls	gre: Call gso_make_checksum	2014-06-04 22:46:38 -07:00
netfilter	ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack	2014-07-16 09:39:28 +09:00
netlabel	netlabel: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
netlink	netlink: Fix handling of error from netlink_dump().	2014-07-09 14:33:47 -07:00
netrom	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
nfc	net: add __pskb_copy_fclone and pskb_copy_for_clone	2014-06-11 15:38:02 -07:00
openvswitch	openvswitch: Use exact lookup for flow_get and flow_del.	2014-06-30 20:47:15 -07:00
packet	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
phonet	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-22 13:58:36 -04:00
rose	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
rxrpc	af_rxrpc: Fix XDR length check in rxrpc key demarshalling.	2014-05-16 15:24:47 -04:00
sched	net_sched: avoid generating same handle for u32 filters	2014-07-20 20:49:17 -07:00
sctp	net: sctp: inherit auth_capable on INIT collisions	2014-07-22 19:56:58 -07:00
sunrpc	NFSv4: test SECINFO RPC_AUTH_GSS pseudoflavors for support	2014-06-24 18:46:58 -04:00
tipc	tipc: clear 'next'-pointer of message fragments before reassembly	2014-07-11 15:02:10 -07:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
vmw_vsock	vsock: Make transport the proto owner	2014-05-05 13:13:50 -04:00
wimax
wireless	cfg80211: fix mic_failure tracing	2014-07-18 09:53:56 +02:00
x25	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
xfrm	xfrm: Fix installation of AH IPsec SAs	2014-06-30 07:42:12 +02:00
compat.c	net/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types	2014-03-06 16:30:45 +01:00
Kconfig	Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2014-04-03 13:05:42 -07:00
Makefile	net: move 6lowpan compression code to separate module	2014-01-15 15:36:38 -08:00
nonet.c
socket.c	net: use SYSCALL_DEFINEx for sys_recv	2014-04-16 15:15:05 -04:00
sysctl_net.c