Commit 5e17da63 authored by Jarno Rajahalme's avatar Jarno Rajahalme Committed by David S. Miller

openvswitch: Fix comments for skb->_nfct

Fix comments referring to skb 'nfct' and 'nfctinfo' fields now that
they are combined into '_nfct'.
Signed-off-by: default avatarJarno Rajahalme <jarno@ovn.org>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Acked-by: default avatarJoe Stringer <joe@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9878f602
...@@ -157,7 +157,7 @@ static void __ovs_ct_update_key(struct sw_flow_key *key, u8 state, ...@@ -157,7 +157,7 @@ static void __ovs_ct_update_key(struct sw_flow_key *key, u8 state,
ovs_ct_get_labels(ct, &key->ct.labels); ovs_ct_get_labels(ct, &key->ct.labels);
} }
/* Update 'key' based on skb->nfct. If 'post_ct' is true, then OVS has /* Update 'key' based on skb->_nfct. If 'post_ct' is true, then OVS has
* previously sent the packet to conntrack via the ct action. If * previously sent the packet to conntrack via the ct action. If
* 'keep_nat_flags' is true, the existing NAT flags retained, else they are * 'keep_nat_flags' is true, the existing NAT flags retained, else they are
* initialized from the connection status. * initialized from the connection status.
...@@ -421,12 +421,12 @@ ovs_ct_get_info(const struct nf_conntrack_tuple_hash *h) ...@@ -421,12 +421,12 @@ ovs_ct_get_info(const struct nf_conntrack_tuple_hash *h)
/* Find an existing connection which this packet belongs to without /* Find an existing connection which this packet belongs to without
* re-attributing statistics or modifying the connection state. This allows an * re-attributing statistics or modifying the connection state. This allows an
* skb->nfct lost due to an upcall to be recovered during actions execution. * skb->_nfct lost due to an upcall to be recovered during actions execution.
* *
* Must be called with rcu_read_lock. * Must be called with rcu_read_lock.
* *
* On success, populates skb->nfct and skb->nfctinfo, and returns the * On success, populates skb->_nfct and returns the connection. Returns NULL
* connection. Returns NULL if there is no existing entry. * if there is no existing entry.
*/ */
static struct nf_conn * static struct nf_conn *
ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,
...@@ -464,7 +464,7 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, ...@@ -464,7 +464,7 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone,
return ct; return ct;
} }
/* Determine whether skb->nfct is equal to the result of conntrack lookup. */ /* Determine whether skb->_nfct is equal to the result of conntrack lookup. */
static bool skb_nfct_cached(struct net *net, static bool skb_nfct_cached(struct net *net,
const struct sw_flow_key *key, const struct sw_flow_key *key,
const struct ovs_conntrack_info *info, const struct ovs_conntrack_info *info,
...@@ -475,7 +475,7 @@ static bool skb_nfct_cached(struct net *net, ...@@ -475,7 +475,7 @@ static bool skb_nfct_cached(struct net *net,
ct = nf_ct_get(skb, &ctinfo); ct = nf_ct_get(skb, &ctinfo);
/* If no ct, check if we have evidence that an existing conntrack entry /* If no ct, check if we have evidence that an existing conntrack entry
* might be found for this skb. This happens when we lose a skb->nfct * might be found for this skb. This happens when we lose a skb->_nfct
* due to an upcall. If the connection was not confirmed, it is not * due to an upcall. If the connection was not confirmed, it is not
* cached and needs to be run through conntrack again. * cached and needs to be run through conntrack again.
*/ */
...@@ -699,7 +699,7 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key, ...@@ -699,7 +699,7 @@ static int ovs_ct_nat(struct net *net, struct sw_flow_key *key,
/* Pass 'skb' through conntrack in 'net', using zone configured in 'info', if /* Pass 'skb' through conntrack in 'net', using zone configured in 'info', if
* not done already. Update key with new CT state after passing the packet * not done already. Update key with new CT state after passing the packet
* through conntrack. * through conntrack.
* Note that if the packet is deemed invalid by conntrack, skb->nfct will be * Note that if the packet is deemed invalid by conntrack, skb->_nfct will be
* set to NULL and 0 will be returned. * set to NULL and 0 will be returned.
*/ */
static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment