summaryrefslogtreecommitdiffstats
path: root/net/openvswitch/conntrack.c
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-09-031-2/+2
|\
| * netfilter: conntrack: make protocol tracker pointers constFlorian Westphal2017-08-241-2/+2
* | openvswitch: Remove unnecessary newlines from OVS_NLERR usesJoe Perches2017-08-111-9/+5
* | openvswitch: fix potential out of bound access in parse_ctLiping Zhang2017-07-241-2/+5
|/
* openvswitch: Fix for force/commit action failuresGreg Rose2017-07-151-15/+36
* netfilter: introduce nf_conntrack_helper_put helper functionLiping Zhang2017-05-151-2/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-05-031-1/+29
|\
| * openvswitch: Delete conntrack entry clashing with an expectation.Jarno Rajahalme2017-04-241-1/+29
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-05-011-5/+0
|\ \
| * | netfilter: remove nf_ct_is_untrackedFlorian Westphal2017-04-151-5/+0
| |/
* | openvswitch: Add eventmask support to CT action.Jarno Rajahalme2017-04-241-0/+27
* | openvswitch: Typo fix.Jarno Rajahalme2017-04-241-1/+1
|/
* openvswitch: Fix refcount leak on force commit.Jarno Rajahalme2017-03-281-2/+2
* ipv6: orphan skbs in reassembly unitEric Dumazet2017-03-011-1/+0
* openvswitch: Set event bit after initializing labels.Jarno Rajahalme2017-02-201-3/+6
* openvswitch: Pack struct sw_flow_key.Jarno Rajahalme2017-02-091-20/+20
* openvswitch: Add force commit.Jarno Rajahalme2017-02-091-2/+24
* openvswitch: Add original direction conntrack tuple to sw_flow_key.Jarno Rajahalme2017-02-091-6/+80
* openvswitch: Inherit master's labels.Jarno Rajahalme2017-02-091-14/+31
* openvswitch: Refactor labels initialization.Jarno Rajahalme2017-02-091-42/+62
* openvswitch: Simplify labels length logic.Jarno Rajahalme2017-02-091-11/+9
* openvswitch: Unionize ovs_key_ct_label with a u32 array.Jarno Rajahalme2017-02-091-7/+8
* openvswitch: Do not trigger events for unconfirmed connections.Jarno Rajahalme2017-02-091-6/+22
* openvswitch: Use inverted tuple in ovs_ct_find_existing() if NATted.Jarno Rajahalme2017-02-091-2/+22
* openvswitch: Fix comments for skb->_nfctJarno Rajahalme2017-02-091-7/+7
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-02-031-7/+5
|\
| * netfilter: add and use nf_ct_set helperFlorian Westphal2017-02-021-4/+2
| * skbuff: add and use skb_nfct helperFlorian Westphal2017-02-021-3/+3
* | openvswitch: maintain correct checksum state in conntrack actionsLance Richardson2017-01-151-2/+4
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-12-031-1/+4
|\
| * openvswitch: Fix skb leak in IPv6 reassembly.Daniele Di Proietto2016-11-301-1/+4
* | netfilter: handle NF_REPEAT from nf_conntrack_in()Pablo Neira Ayuso2016-11-031-6/+2
|/
* openvswitch: Free tmpl with tmpl_free.Joe Stringer2016-09-041-1/+1
* openvswitch: Remove incorrect WARN_ONCE().Jarno Rajahalme2016-08-031-7/+1
* netfilter: conntrack: support a fixed size of 128 distinct labelsFlorian Westphal2016-07-221-2/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-06-301-2/+12
|\
| * openvswitch: fix conntrack netlink event deliverySamuel Gauthier2016-06-291-2/+12
* | openvswitch: Only set mark and labels with a commit flag.Jarno Rajahalme2016-06-251-25/+51
* | openvswitch: Set mark and labels before confirming.Jarno Rajahalme2016-06-251-19/+14
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-05-151-0/+13
|\
| * openvswitch: Fix cached ct with helper.Joe Stringer2016-05-111-0/+13
* | openvswitch: __nf_ct_l{3,4}proto_find() always return a valid pointerPablo Neira Ayuso2016-05-051-8/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-04-241-1/+1
|\ \ | |/ |/|
| * netfilter: connlabels: change nf_connlabels_get bit arg to 'highest used'Florian Westphal2016-04-181-1/+1
* | openvswitch: Orphan skbs before IPv6 defragJoe Stringer2016-04-211-0/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2016-03-281-10/+11
|\
| * openvswitch: call only into reachable nf-nat codeArnd Bergmann2016-03-281-8/+8
| * openvswitch: Fix checking for new expected connections.Jarno Rajahalme2016-03-281-2/+3
* | openvswitch: Use proper buffer size in nla_memcpyHaishuang Yan2016-03-281-1/+2
|/
* openvswitch: Interface with NAT.Jarno Rajahalme2016-03-141-26/+498