| conntrack.c (c900529f3d9161bfde5cca0754f83b4d3c3e0220) | conntrack.c (d5a116dbe7123f6c1bdc581500349ff3bb9416f9) |
|---|---|
| 1// SPDX-License-Identifier: GPL-2.0-only 2/* 3 * Copyright (c) 2015 Nicira, Inc. 4 */ 5 6#include <linux/module.h> 7#include <linux/openvswitch.h> 8#include <linux/tcp.h> --- 971 unchanged lines hidden (view full) --- 980 return err; 981 } 982 if (!nf_ct_is_confirmed(ct)) { 983 err = ovs_ct_init_labels(ct, key, &info->labels.value, 984 &info->labels.mask); 985 if (err) 986 return err; 987 | 1// SPDX-License-Identifier: GPL-2.0-only 2/* 3 * Copyright (c) 2015 Nicira, Inc. 4 */ 5 6#include <linux/module.h> 7#include <linux/openvswitch.h> 8#include <linux/tcp.h> --- 971 unchanged lines hidden (view full) --- 980 return err; 981 } 982 if (!nf_ct_is_confirmed(ct)) { 983 err = ovs_ct_init_labels(ct, key, &info->labels.value, 984 &info->labels.mask); 985 if (err) 986 return err; 987 |
| 988 nf_conn_act_ct_ext_add(ct); | 988 nf_conn_act_ct_ext_add(skb, ct, ctinfo); |
| 989 } else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) && 990 labels_nonzero(&info->labels.mask)) { 991 err = ovs_ct_set_labels(ct, key, &info->labels.value, 992 &info->labels.mask); 993 if (err) 994 return err; 995 } 996 /* This will take care of sending queued events even if the connection --- 1003 unchanged lines hidden --- | 989 } else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) && 990 labels_nonzero(&info->labels.mask)) { 991 err = ovs_ct_set_labels(ct, key, &info->labels.value, 992 &info->labels.mask); 993 if (err) 994 return err; 995 } 996 /* This will take care of sending queued events even if the connection --- 1003 unchanged lines hidden --- |