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
..
9p	9pnet: p9_client->conn field is unused. Remove it.	2014-03-25 16:38:16 -05:00
bluetooth	Bluetooth: Fix hci_conn reference counting for auto-connections	2014-08-20 21:57:39 +03:00
caif
irda
iucv
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
netns	ieee802154: 6lowpan: ensure MTU of 1280 for 6lowpan	2014-08-19 19:17:42 +02:00
nfc	NFC: digital: Add 'tg_listen_md' and 'tg_get_rf_tech' driver hooks	2014-07-23 01:17:31 +02:00
phonet
sctp	net: sctp: fix ABI mismatch through sctp_assoc_to_state helper	2014-08-29 20:31:08 -07:00
tc_act	net_sched: act: hide struct tcf_common from API	2014-02-12 19:23:32 -05:00
6lowpan.h	6lowpan: remove unused function	2014-07-30 19:28:41 +02:00
act_api.h	net_sched: act: refuse to remove bound action outside	2014-02-12 19:23:32 -05:00
addrconf.h	net: ipv6: Introduce ip6_sk_dst_hoplimit.	2014-04-30 13:31:26 -04:00
af_ieee802154.h	ieee802154: add dgram sockopts for security control	2014-05-16 17:23:41 -04:00
af_rxrpc.h
af_unix.h
af_vsock.h	vsock: Make transport the proto owner	2014-05-05 13:13:50 -04:00
ah.h
arp.h	arp: make arp_invalidate static	2013-12-28 17:02:46 -05:00
atmclip.h
ax25.h
ax88796.h
busy_poll.h	sched, net: Fixup busy_loop_us_clock()	2014-01-13 17:39:11 +01:00
cfg80211-wext.h
cfg80211.h	cfg80211: remove channel_switch combination check	2014-06-25 18:06:20 +02:00
checksum.h	net: Allow csum_add to be provided in arch	2014-05-05 15:26:29 -04:00
cipso_ipv4.h
cls_cgroup.h	cgroup: clean up cgroup_subsys names and initialization	2014-02-08 10:36:58 -05:00
codel.h	net: introduce reciprocal_scale helper and convert users	2014-01-21 23:17:20 -08:00
compat.h
datalink.h	net: Move prototype declaration to header file include/net/datalink.h from net/ipx/af_ipx.c	2014-02-09 17:32:50 -08:00
dcbevent.h
dcbnl.h	Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8	2014-07-17 16:02:29 -07:00
dn.h	net: Move prototype declaration to header file include/net/dn.h from net/decnet/af_decnet.c	2014-02-09 17:32:49 -08:00
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h	net: Move prototype declaration to appropriate header file from decnet/af_decnet.c	2014-02-09 17:32:49 -08:00
dsa.h	net: dsa: add ds_to_priv	2014-04-30 13:31:25 -04:00
dsfield.h
dst.h	ipv4: add a sock pointer to dst->output() path.	2014-04-15 13:47:15 -04:00
dst_ops.h
esp.h
ethoc.h	net: ethoc: set up MII management bus clock	2014-02-04 20:19:51 -08:00
fib_rules.h
firewire.h
flow.h	ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif	2014-04-16 15:05:11 -04:00
flow_keys.h	flow_dissector: Abstract out hash computation	2014-07-07 21:14:20 -07:00
flowcache.h	flowcache: Make flow cache name space aware	2014-02-12 07:02:11 +01:00
garp.h
gen_stats.h
genetlink.h	genl: Add genlmsg_new_unicast() for unicast message allocation	2014-01-06 15:51:53 -08:00
gre.h	gre: Call gso_make_checksum	2014-06-04 22:46:38 -07:00
gro_cells.h
icmp.h
ieee80211_radiotap.h	mac80211: propagate STBC / LDPC flags to radiotap	2014-02-06 09:34:58 +01:00
ieee802154.h	ieee802154: add definitions for link-layer security and header functions	2014-05-15 15:51:42 -04:00
ieee802154_netdev.h	ieee802154, mac802154: implement devkey record option	2014-05-16 17:23:42 -04:00
if_inet6.h	ipv6: addrconf: implement address generation modes	2014-07-11 15:05:45 -07:00
inet6_connection_sock.h	ipv4: add a sock pointer to ip_queue_xmit()	2014-04-15 12:58:34 -04:00
inet6_hashtables.h
inet_common.h
inet_connection_sock.h	tcp: fix tcp_release_cb() to dispatch via address family for mtu_reduced()	2014-08-14 14:38:54 -07:00
inet_ecn.h	tunnel: fix RFC number in comment for INET_ECN_decapsulate()	2014-05-07 15:30:52 -04:00
inet_frag.h	inet: frags: use kmem_cache for inet_frag_queue	2014-08-02 15:31:31 -07:00
inet_hashtables.h	net: Use a more standard macro for INET_ADDR_COOKIE	2014-05-14 16:07:23 -04:00
inet_sock.h	net: remove inet6_reqsk_alloc	2014-06-27 15:53:35 -07:00
inet_timewait_sock.h	inet: move ipv6only in sock_common	2014-07-01 23:46:21 -07:00
inetpeer.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
ip.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-30 13:25:49 -07:00
ip6_checksum.h	udp: Generic functions to set checksum	2014-06-04 22:46:38 -07:00
ip6_fib.h	ipv6: do not overwrite inetpeer metrics prematurely	2014-03-27 15:09:07 -04:00
ip6_route.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
ip6_tunnel.h	net: unify the pcpu_tstats and br_cpu_netstats as one	2014-01-04 20:10:24 -05:00
ip_fib.h
ip_tunnels.h	ip_tunnel(ipv4): fix tunnels with "local any remote $remote_ip"	2014-07-30 15:18:58 -07:00
ip_vs.h	arch: Mass conversion of smp_mb__*()	2014-04-18 14:20:48 +02:00
ipcomp.h
ipconfig.h
ipv6.h	inet: frag: don't account number of fragment queues	2014-07-27 22:34:36 -07:00
ipx.h	net: Move prototype declaration to header file include/net/ipx.h from net/ipx/af_ipx.c	2014-02-09 17:32:50 -08:00
iw_handler.h
lapb.h
lib80211.h
llc.h	llc: make lock static	2014-01-03 20:56:48 -05:00
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h	net: llc: fix order of evaluation in llc_conn_ac_inc_vr_by_1	2014-01-01 22:22:43 -05:00
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
mac80211.h	mac80211: add support for Rx reordering offloading	2014-07-21 17:42:07 +02:00
mac802154.h	mac802154: at86rf230: add hw flags and merge ops	2014-07-07 21:29:24 -07:00
mip6.h
mld.h
mrp.h
ndisc.h
neighbour.h	neigh: sysctl - simplify address calculation of gc_* variables	2014-07-14 14:32:51 -07:00
net_namespace.h	6lowpan: nuke net_ieee802154_lowpan() accessor when 6lowpan is disabled	2014-04-24 12:36:00 -04:00
net_ratelimit.h
netdma.h
netevent.h
netlabel.h	netlabel: fix the netlbl_catmap_setlong() dummy function	2014-08-07 20:55:21 -04:00
netlink.h	netlink: Fix shadow warning on jiffies	2014-07-28 17:20:43 -07:00
netprio_cgroup.h	cgroup: clean up cgroup_subsys names and initialization	2014-02-08 10:36:58 -05:00
netrom.h
nexthop.h
nl802154.h	ieee802154: use ieee802154_addr instead of *_sa variants	2014-03-14 22:15:26 -04:00
p8022.h
ping.h	ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams	2014-01-19 19:53:18 -08:00
pkt_cls.h	sched, cls: check if we could overwrite actions when changing a filter	2014-04-27 23:42:39 -04:00
pkt_sched.h	net_sched: drr: warn when qdisc is not work conserving	2014-06-11 15:50:59 -07:00
protocol.h	net: Eliminate no_check from protosw	2014-05-23 16:28:53 -04:00
psnap.h
raw.h
rawv6.h
red.h	reciprocal_divide: update/correction of the algorithm	2014-01-21 23:17:20 -08:00
regulatory.h	regulatory: add NUL to alpha2	2014-08-15 13:51:40 +02:00
request_sock.h
rose.h
route.h	ipv4: remove ip_rt_dump from route.c	2014-03-24 12:45:01 -04:00
rtnetlink.h	net: rtnetlink - make create_link take name_assign_type	2014-07-15 16:13:07 -07:00
sch_generic.h	flow_keys: Record IP layer protocol in skb_flow_dissect()	2014-06-23 14:32:19 -07:00
scm.h
secure_seq.h	inetpeer: get rid of ip_id_count	2014-06-02 11:00:41 -07:00
slhc_vj.h
snmp.h	net: clean up snmp stats code	2014-05-07 16:06:05 -04:00
sock.h	net-timestamp: only report sw timestamp if reporting bit is set	2014-09-05 15:02:43 -07:00
Space.h	drivers: net: Include new header file in sbni.c	2013-12-19 18:51:20 -05:00
stp.h
tcp.h	tcp: don't allow syn packets without timestamps to pass tcp_tw_recycle logic	2014-08-14 14:38:54 -07:00
tcp_memcontrol.h
tcp_states.h
timewait_sock.h
transp_v6.h	ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams	2014-01-19 19:53:18 -08:00
tso.h	net: Add a software TSO helper API	2014-05-22 14:57:15 -04:00
udp.h	udp: Add function to make source port for UDP tunnels	2014-07-07 21:14:21 -07:00
udp_tunnel.h	udp: Add udp_sock_create for UDP tunnels to open listener socket	2014-07-14 16:12:15 -07:00
udplite.h
vsock_addr.h
vxlan.h	vxlan: Call udp_flow_src_port	2014-07-07 21:14:21 -07:00
wext.h
wimax.h	net: treewide: Fix typo found in DocBook/networking.xml	2014-09-05 17:35:28 -07:00
wpan-phy.h	ieee802154: add netlink APIs for smartMAC configuration	2014-02-17 16:42:39 -05:00
x25.h
x25device.h
xfrm.h	xfrm: Remove useless xfrm_audit struct.	2014-04-23 08:21:04 +02:00