diff options
Diffstat (limited to 'net/openvswitch/conntrack.c')
-rw-r--r-- | net/openvswitch/conntrack.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index c644c78ed485..e054a748ff25 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c | |||
@@ -433,7 +433,6 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, | |||
433 | struct nf_conntrack_l4proto *l4proto; | 433 | struct nf_conntrack_l4proto *l4proto; |
434 | struct nf_conntrack_tuple tuple; | 434 | struct nf_conntrack_tuple tuple; |
435 | struct nf_conntrack_tuple_hash *h; | 435 | struct nf_conntrack_tuple_hash *h; |
436 | enum ip_conntrack_info ctinfo; | ||
437 | struct nf_conn *ct; | 436 | struct nf_conn *ct; |
438 | unsigned int dataoff; | 437 | unsigned int dataoff; |
439 | u8 protonum; | 438 | u8 protonum; |
@@ -458,13 +457,8 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, | |||
458 | 457 | ||
459 | ct = nf_ct_tuplehash_to_ctrack(h); | 458 | ct = nf_ct_tuplehash_to_ctrack(h); |
460 | 459 | ||
461 | ctinfo = ovs_ct_get_info(h); | ||
462 | if (ctinfo == IP_CT_NEW) { | ||
463 | /* This should not happen. */ | ||
464 | WARN_ONCE(1, "ovs_ct_find_existing: new packet for %p\n", ct); | ||
465 | } | ||
466 | skb->nfct = &ct->ct_general; | 460 | skb->nfct = &ct->ct_general; |
467 | skb->nfctinfo = ctinfo; | 461 | skb->nfctinfo = ovs_ct_get_info(h); |
468 | return ct; | 462 | return ct; |
469 | } | 463 | } |
470 | 464 | ||