David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The bpf syscall and selftests conflicts were trivial overlapping changes. The r8169 change involved moving the added mdelay from 'net' into a different function. A TLS close bug fix overlapped with the splitting of the TLS state into separate TX and RX parts. I just expanded the tests in the bug fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf == X". Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-11 20:53:22 -04:00
..
actions.c	openvswitch: Add meter action support	2017-11-13 10:37:07 +09:00
conntrack.c	netfilter: add NAT support for shifted portmap ranges	2018-04-24 10:29:12 +02:00
conntrack.h	openvswitch: add ct_clear action	2017-10-10 16:38:34 -07:00
datapath.c	ovs: Remove rtnl_lock() from ovs_exit_net()	2018-03-29 13:47:54 -04:00
datapath.h	openvswitch: Add meter action support	2017-11-13 10:37:07 +09:00
dp_notify.c	openvswitch: reliable interface indentification in port dumps	2017-11-05 21:49:17 +09:00
flow_netlink.c	openvswitch: Don't swap table in nlattr_set() after OVS_ATTR_NESTED is found	2018-05-04 12:51:02 -04:00
flow_netlink.h	openvswitch: enable NSH support	2017-11-08 16:12:33 +09:00
flow_table.c	openvswitch: Optimize operations for OvS flow_stats.	2017-07-19 13:49:39 -07:00
flow_table.h	openvswitch: Zero flows on allocation.	2015-09-22 17:33:41 -07:00
flow.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
flow.h	openvswitch: enable NSH support	2017-11-08 16:12:33 +09:00
Kconfig	openvswitch: enable NSH support	2017-11-08 16:12:33 +09:00
Makefile	openvswitch: Add meter infrastructure	2017-11-13 10:37:07 +09:00
meter.c	openvswitch: meter: fix the incorrect calculation of max delta_t	2018-03-11 22:48:59 -04:00
meter.h	openvswitch: Add meter infrastructure	2017-11-13 10:37:07 +09:00
vport-geneve.c	openvswitch: do not ignore netdev errors when creating tunnel vports	2016-08-10 23:13:23 -07:00
vport-gre.c	openvswitch: do not ignore netdev errors when creating tunnel vports	2016-08-10 23:13:23 -07:00
vport-internal_dev.c	net: ovs: remove unused hardirq.h	2018-01-08 20:59:25 -05:00
vport-internal_dev.h
vport-netdev.c	net: Add extack to upper device linking	2017-10-04 21:39:33 -07:00
vport-netdev.h	openvswitch: Use dev_queue_xmit for vport send.	2015-10-22 06:46:16 -07:00
vport-vxlan.c	vxlan: get rid of redundant vxlan_dev.flags	2017-06-20 13:37:02 -04:00
vport.c	openvswitch: fix vport packet length check.	2018-03-08 12:50:29 -05:00
vport.h	openvswitch: pass mac_proto to ovs_vport_send	2016-11-13 00:51:02 -05:00