David S. Miller 995dca4ce9 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Steffen Klassert says: ==================== One patch to rename a newly introduced struct. The rest is the rework of the IPsec virtual tunnel interface for ipv6 to support inter address family tunneling and namespace crossing. 1) Rename the newly introduced struct xfrm_filter to avoid a conflict with iproute2. From Nicolas Dichtel. 2) Introduce xfrm_input_afinfo to access the address family dependent tunnel callback functions properly. 3) Add and use a IPsec protocol multiplexer for ipv6. 4) Remove dst_entry caching. vti can lookup multiple different dst entries, dependent of the configured xfrm states. Therefore it does not make to cache a dst_entry. 5) Remove caching of flow informations. vti6 does not use the the tunnel endpoint addresses to do route and xfrm lookups. 6) Update the vti6 to use its own receive hook. 7) Remove the now unused xfrm_tunnel_notifier. This was used from vti and is replaced by the IPsec protocol multiplexer hooks. 8) Support inter address family tunneling for vti6. 9) Check if the tunnel endpoints of the xfrm state and the vti interface are matching and return an error otherwise. 10) Enable namespace crossing for vti devices. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-18 14:09:07 -04:00
..
9p
bluetooth	Bluetooth: Remove unnecessary stop_scan_complete function	2014-02-28 10:28:17 -08:00
caif
irda	include/net/: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
iucv
netfilter	netfilter: nf_tables: restore context for expression destructors	2014-03-08 12:35:17 +01:00
netns	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2014-03-17 15:06:24 -04:00
nfc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-17 14:43:17 -05:00
phonet
sctp	net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer	2014-02-17 00:16:56 -05:00
tc_act	net_sched: act: hide struct tcf_common from API	2014-02-12 19:23:32 -05:00
6lowpan.h	6lowpan: move 6lowpan header to include/net	2014-03-06 17:21:38 -05:00
act_api.h	net_sched: act: refuse to remove bound action outside	2014-02-12 19:23:32 -05:00
addrconf.h	ipv6: addrconf: silence sparse endianness warnings	2014-02-27 17:13:20 -05:00
af_ieee802154.h	ieee802154: rename struct ieee802154_addr to *_sa	2014-03-14 22:15:25 -04:00
af_rxrpc.h
af_unix.h
af_vsock.h
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: docbook: add interface combinations documentation	2014-02-21 09:27:34 +01:00
checksum.h
cipso_ipv4.h	cipso: cleanup cipso_v4_translate() when !CONFIG_NETLABEL	2013-12-10 17:56:54 -05:00
cls_cgroup.h	net: net_cls: move cgroupfs classid handling into core	2014-01-03 23:41:41 +01: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	include/net/: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
dcbnl.h	include/net/: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
dn_dev.h	dn_dev: add support for IFA_FLAGS nl attribute	2013-12-10 21:50:00 -05:00
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
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
dsa.h
dsfield.h
dst_ops.h
dst.h	inet: remove now unused flag DST_NOPEER	2014-03-06 13:15:52 -05:00
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_keys.h
flow.h	flowcache: Fix resource leaks on namespace exit.	2014-03-12 15:31:18 -04: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_offload: statically build GRE offloading support	2014-01-06 20:28:34 -05: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_netdev.h	6lowpan: move lowpan frag_info out of 802.15.4 headers	2014-03-14 22:15:26 -04:00
ieee802154.h	ieee802154: add header structs with endiannes and operations	2014-03-14 22:15:26 -04:00
if_inet6.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-18 00:55:41 -08:00
inet6_connection_sock.h
inet6_hashtables.h
inet_common.h
inet_connection_sock.h
inet_ecn.h
inet_frag.h
inet_hashtables.h
inet_sock.h
inet_timewait_sock.h	ipv6: tcp: fix flowlabel value in ACK messages send from TIME_WAIT	2014-01-17 17:56:33 -08:00
inetpeer.h	ipv4: remove unused function	2013-12-28 17:03:20 -05:00
ip6_checksum.h
ip6_fib.h	ipv6: remove prune parameter for fib6_clean_all	2014-01-02 03:30:35 -05:00
ip6_route.h	ipv6: yet another new IPV6_MTU_DISCOVER option IPV6_PMTUDISC_OMIT	2014-02-26 15:51:01 -05: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	sit: fix panic with route cache in ip tunnels	2014-02-20 13:13:50 -05:00
ip_vs.h
ip.h	tcp: Use NET_ADD_STATS instead of NET_ADD_STATS_BH in tcp_event_new_data_sent()	2014-03-06 15:19:43 -05:00
ipcomp.h
ipconfig.h
ipv6.h	ipv6: protect protocols not handling ipv4 from v4 connection/bind attempts	2014-01-21 16:59:19 -08: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_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
llc.h	llc: make lock static	2014-01-03 20:56:48 -05:00
mac80211.h	mac80211: allow driver to return error from sched_scan_stop	2014-02-20 16:09:54 +01:00
mac802154.h	ieee802154: add header structs with endiannes and operations	2014-03-14 22:15:26 -04:00
mip6.h	include/net/: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
mld.h
mrp.h
ndisc.h
neighbour.h	neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.	2014-01-16 11:31:58 -08:00
net_namespace.h	net: ns: add ieee802154_6lowpan namespace	2014-02-28 17:05:22 -05:00
net_ratelimit.h
netdma.h
netevent.h
netlabel.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
netlink.h
netprio_cgroup.h	net: netprio: rename config to be more consistent with cgroup configs	2014-01-03 23:41:42 +01: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	net_sched: optimize tcf_match_indev()	2014-01-13 11:50:15 -08:00
pkt_sched.h	pkt_sched: give visibility to mq slave qdiscs	2013-12-09 19:54:47 -05:00
protocol.h	net: Add GRO support for UDP encapsulating protocols	2014-01-21 18:05:04 -08: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	cfg80211: make regulatory_hint() remove REGULATORY_CUSTOM_REG	2014-01-13 14:46:58 -05:00
request_sock.h
rose.h
route.h	ipv4: introduce ip_dst_mtu_maybe_forward and protect forwarding path against pmtu spoofing	2014-01-13 11:22:54 -08:00
rtnetlink.h	rtnl: make ifla_policy static	2014-02-18 18:15:42 -05:00
sch_generic.h	net_sched: add struct net pointer to tcf_proto_ops->dump	2014-01-13 11:50:14 -08:00
scm.h
secure_seq.h
slhc_vj.h
snmp.h
sock.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
Space.h	drivers: net: Include new header file in sbni.c	2013-12-19 18:51:20 -05:00
stp.h
tcp_memcontrol.h
tcp_states.h
tcp.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
timewait_sock.h
transp_v6.h	ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams	2014-01-19 19:53:18 -08:00
udp.h
udplite.h
vsock_addr.h
vxlan.h	net: Add GRO support for vxlan traffic	2014-01-21 18:05:04 -08:00
wext.h
wimax.h
wpan-phy.h	ieee802154: add netlink APIs for smartMAC configuration	2014-02-17 16:42:39 -05:00
x25.h
x25device.h
xfrm.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2014-03-18 14:09:07 -04:00