David S. Miller 45ce829dd0 Merge tag 'master-2014-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... John W. Linville says: ==================== pull request: wireless 2014-09-05 Please pull this batch of fixes intended for the 3.17 stream... For the mac80211 bits, Johannes says: "Here are a few fixes for mac80211. One has been discussed for a while and adds a terminating NUL-byte to the alpha2 sent to userspace, which shouldn't be necessary but since many places treat it as a string we couldn't move to just sending two bytes. In addition to that, we have two VLAN fixes from Felix, a mesh fix, a fix for the recently introduced RX aggregation offload, a revert for a broken patch (that luckily didn't really cause any harm) and a small fix for alignment in debugfs." For the iwlwifi bits, Emmanuel says: "I revert a patch that disabled CTS to self in dvm because users reported issues. The revert is CCed to stable since the offending patch was sent to stable too. I also bump the firmware API versions since a new firmware is coming up. On top of that, Marcel fixes a bug I introduced while fixing a bug in our Kconfig file." Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-07 16:11:10 -07:00
..
6lowpan	6lowpan: Allow 6LoWPAN to be modular	2014-08-07 11:44:18 -07:00
9p	9P: remove unnecessary break after return	2014-07-15 16:27:00 -07:00
802	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
8021q	net: Always untag vlan-tagged traffic on input.	2014-08-11 12:16:51 -07:00
appletalk	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-16 14:09:34 -07:00
atm	lec: Use rtnl lock/unlock when updating MTU	2014-08-21 16:31:23 -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 parameter order of hlist_add_behind	2014-08-16 19:19:08 -07:00
bluetooth	Bluetooth: Fix hci_conn reference counting for auto-connections	2014-08-20 21:57:39 +03:00
bridge	net: Always untag vlan-tagged traffic on input.	2014-08-11 12:16:51 -07:00
caif	caif: remove unnecessary break after goto	2014-07-15 16:27:01 -07: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-08-13 17:43:29 -06:00
core	net: treewide: Fix typo found in DocBook/networking.xml	2014-09-05 17:35:28 -07:00
dcb	dcbnl : Fix misleading dcb_app->priority explanation	2014-07-30 17:21:05 -07:00
dccp	inet: move ipv6only in sock_common	2014-07-01 23:46:21 -07:00
decnet	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
dns_resolver	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2014-08-06 08:06:39 -07:00
dsa	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
ethernet	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
hsr	net/hsr: Remove left-over never-true conditional code.	2014-07-11 15:04:40 -07:00
ieee802154	ieee802154: 6lowpan: ensure MTU of 1280 for 6lowpan	2014-08-19 19:17:42 +02:00
ipv4	netfilter: move NAT Kconfig switches out of the iptables scope	2014-08-18 21:55:54 +02:00
ipv6	ipv6: restore the behavior of ipv6_sock_ac_drop()	2014-09-07 16:10:07 -07:00
ipx	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
irda	irda: Fix rd_frame control field initialization in irlap_send_rd_frame()	2014-08-13 20:05:52 -07:00
iucv	af_iucv: avoid path quiesce of severed path in shutdown()	2014-07-21 20:21:40 -07:00
key	af_key: remove unnecessary break after return	2014-07-15 16:27:00 -07:00
l2tp	l2tp: fix race while getting PMTU on PPP pseudo-wire	2014-09-05 14:40:18 -07:00
lapb
llc
mac80211	Here are a few fixes for mac80211. One has been discussed for a while	2014-09-04 13:08:24 -04:00
mac802154	ieee802154: mac802154: handle the reserved dest mode by dropping the packet	2014-08-19 19:17:41 +02:00
mpls	gre: Call gso_make_checksum	2014-06-04 22:46:38 -07:00
netfilter	netfilter: add explicit Kconfig for NETFILTER_XT_NAT	2014-09-05 17:23:31 -07:00
netlabel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-08-06 09:38:14 -07:00
netlink	netlink: Annotate RCU locking for seq_file walker	2014-08-14 15:13:40 -07:00
netrom	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
nfc	Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-08-05 13:18:20 -07:00
openvswitch	openvswitch: distinguish between the dropped and consumed skb	2014-09-03 20:50:51 -07:00
packet	packet: handle too big packets for PACKET_V3	2014-08-21 16:44:28 -07:00
phonet	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
rfkill	net: rfkill: gpio: Add more Broadcom bluetooth ACPI IDs	2014-08-25 15:39:23 -04:00
rose	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-08-06 09:38:14 -07:00
sched	cbq: now_rt removal	2014-08-19 10:58:44 -07:00
sctp	net: sctp: fix ABI mismatch through sctp_assoc_to_state helper	2014-08-29 20:31:08 -07:00
sunrpc	NFS client updates for Linux 3.17	2014-08-13 18:13:19 -06:00
tipc	tipc: Fix build.	2014-08-19 11:16:38 -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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-07-25 10:22:36 -04: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	list: fix order of arguments for hlist_add_after(_rcu)	2014-08-06 18:01:24 -07:00
compat.c	net: sendmsg: fix NULL pointer dereference	2014-07-29 12:20:22 -07:00
Kconfig	6lowpan: introduce new net/6lowpan directory	2014-07-12 01:53:30 +02:00
Makefile	6lowpan: introduce new net/6lowpan directory	2014-07-12 01:53:30 +02:00
nonet.c
socket.c	net: treewide: Fix typo found in DocBook/networking.xml	2014-09-05 17:35:28 -07:00
sysctl_net.c