On Fri, Aug 21, 2020 at 6:50 AM Greg Rose <[email protected]> wrote: > > From: Tonghao Zhang <[email protected]> > > Upstream commit: > commit 515b65a4b99197ae062a795ab4de919e6d04be04 > Author: Tonghao Zhang <[email protected]> > Date: Fri Nov 1 22:23:50 2019 +0800 > > net: openvswitch: simplify the flow_hash > > Simplify the code and remove the unnecessary BUILD_BUG_ON. > > Signed-off-by: Tonghao Zhang <[email protected]> > Tested-by: Greg Rose <[email protected]> > Acked-by: William Tu <[email protected]> > Acked-by: Pravin B Shelar <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > > Cc: Tonghao Zhang <[email protected]> > Signed-off-by: Greg Rose <[email protected]> Reviewed-by: Tonghao Zhang <[email protected]> > --- > datapath/flow_table.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/datapath/flow_table.c b/datapath/flow_table.c > index 62d726d..7efaa80 100644 > --- a/datapath/flow_table.c > +++ b/datapath/flow_table.c > @@ -455,13 +455,10 @@ err_free_ti: > static u32 flow_hash(const struct sw_flow_key *key, > const struct sw_flow_key_range *range) > { > - int key_start = range->start; > - int key_end = range->end; > - const u32 *hash_key = (const u32 *)((const u8 *)key + key_start); > - int hash_u32s = (key_end - key_start) >> 2; > + const u32 *hash_key = (const u32 *)((const u8 *)key + range->start); > > /* Make sure number of hash bytes are multiple of u32. */ > - BUILD_BUG_ON(sizeof(long) % sizeof(u32)); > + int hash_u32s = range_n_bytes(range) >> 2; > > return jhash2(hash_key, hash_u32s, 0); > } > -- > 1.8.3.1 >
-- Best regards, Tonghao _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
