[ovs-dev] [PATCH net-next v4 4/8] openvswitch: Update the CT state key only after nf_conntrack_in().

[Sergei Shtylyov]

Hello.

On 12/9/2015 4:01 AM, Jarno Rajahalme wrote:

> Only a successful nf_conntrack_in() call can effect a connection state
> change, so if suffices to update the key only after the
> nf_conntrack_in() returns.
>
> This change is needed for the later NAT patches.
>
> Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
> ---
>   net/openvswitch/conntrack.c | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
> index a28a819..10f4a6e 100644
> --- a/net/openvswitch/conntrack.c
> +++ b/net/openvswitch/conntrack.c
> @@ -194,7 +194,6 @@ static int ovs_ct_set_mark(struct sk_buff *skb, struct sw_flow_key *key,
>   	struct nf_conn *ct;
>   	u32 new_mark;
>
> -

    Unrelated whitespace change?

[...]

MBR, Sergei