summaryrefslogtreecommitdiffstats
path: root/net/openvswitch/conntrack.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* openvswitch: Delay conntrack helper call for new connections.Jarno Rajahalme2016-03-141-5/+16
* openvswitch: Handle NF_REPEAT in conntrack action.Jarno Rajahalme2016-03-141-2/+8
* openvswitch: Find existing conntrack entry after upcall.Jarno Rajahalme2016-03-141-13/+90
* openvswitch: Update the CT state key only after nf_conntrack_in().Jarno Rajahalme2016-03-141-3/+4
* openvswitch: Add commentary to conntrack.cJarno Rajahalme2016-03-141-1/+20
* netfilter: Remove IP_CT_NEW_REPLY definition.Jarno Rajahalme2016-03-141-2/+0
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-12-311-2/+4
|\
| * openvswitch: Fix template leak in error cases.Joe Stringer2015-12-291-2/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-12-181-20/+5
|\ \ | |/ |/|
| * netfilter: ipv6: avoid nf_iterate recursionFlorian Westphal2015-11-231-6/+5
| * netfilter: ipv6: nf_defrag: avoid/free clone operationsFlorian Westphal2015-11-231-14/+0
* | openvswitch: Respect conntrack zone even if invalidJoe Stringer2015-12-111-2/+5
* | openvswitch: Fix helper reference leakJoe Stringer2015-12-111-1/+8
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-11-011-4/+20
|\
| * openvswitch: Fix skb leak using IPv6 defragJoe Stringer2015-10-271-0/+7
| * openvswitch: Fix double-free on ip_defrag() errorsJoe Stringer2015-10-271-4/+13
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-10-241-9/+15
|\|
| * openvswitch: Serialize nested ct actions if providedJoe Stringer2015-10-211-4/+10
| * openvswitch: Mark connections new when not confirmed.Joe Stringer2015-10-211-5/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-10-201-45/+44
|\|
| * openvswitch: Change CT_ATTR_FLAGS to CT_ATTR_COMMITJoe Stringer2015-10-071-7/+6
| * openvswitch: Extend ct_state match field to 32 bitsJoe Stringer2015-10-071-1/+1
| * openvswitch: Rename LABEL->LABELSJoe Stringer2015-10-051-37/+37
* | ipv6: Pass struct net into nf_ct_frag6_gatherEric W. Biederman2015-10-121-1/+1
* | ipv4: Pass struct net into ip_defrag and ip_check_defragEric W. Biederman2015-10-121-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-09-261-3/+5
|\|
| * openvswitch: Fix IPv6 exthdr handling with ct helpers.Joe Stringer2015-09-171-3/+5
* | netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tupleEric W. Biederman2015-09-181-1/+1
|/
* openvswitch: Fix conntrack compilation without mark.Joe Stringer2015-08-281-3/+14
* openswitch: fix typo CONFIG_NF_CONNTRACK_LABELValentin Rothberg2015-08-281-1/+1
* openvswitch: Allow attaching helpers to ct actionJoe Stringer2015-08-271-2/+107
* openvswitch: Allow matching on conntrack labelJoe Stringer2015-08-271-2/+126
* openvswitch: Allow matching on conntrack markJoe Stringer2015-08-271-3/+64