Message ID | 1550178908-28995-1-git-send-email-dlu998@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev,v1] conntrack: Remove redundant call to 'hash_finish()'. | expand |
On Thu, Feb 14, 2019 at 01:15:07PM -0800, Darrell Ball wrote:
> Signed-off-by: Darrell Ball <dlu998@gmail.com>
Thanks for the series. I applied it to master.
diff --git a/lib/conntrack.c b/lib/conntrack.c index c543aea..9a618a5 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -2010,11 +2010,9 @@ conn_key_hash(const struct conn_key *key, uint32_t basis) hash = hsrc ^ hdst; /* Hash the rest of the key(L3 and L4 types and zone). */ - hash = hash_words((uint32_t *) (&key->dst + 1), + return hash_words((uint32_t *) (&key->dst + 1), (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1), hash); - - return hash_finish(hash, 0); } static void
Signed-off-by: Darrell Ball <dlu998@gmail.com> --- lib/conntrack.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)