[PATCH][net-next] tun: not use hardcoded mask value

[PATCH][net-next] tun: not use hardcoded mask value

[Li RongQing]

0x3ff in tun_hashfn is mask of TUN_NUM_FLOW_ENTRIES, instead
of hardcode, define a macro to setup the relationship with
TUN_NUM_FLOW_ENTRIES

Signed-off-by: Li RongQing <lirongqing@baidu.com>
---
 drivers/net/tun.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 0a3134712652..2bbefe828670 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -200,6 +200,7 @@ struct tun_flow_entry {
 };
 
 #define TUN_NUM_FLOW_ENTRIES 1024
+#define TUN_MASK_FLOW_ENTRIES (TUN_NUM_FLOW_ENTRIES - 1)
 
 struct tun_prog {
 	struct rcu_head rcu;
@@ -406,7 +407,7 @@ static inline __virtio16 cpu_to_tun16(struct tun_struct *tun, u16 val)
 
 static inline u32 tun_hashfn(u32 rxhash)
 {
-	return rxhash & 0x3ff;
+	return rxhash & TUN_MASK_FLOW_ENTRIES;
 }
 
 static struct tun_flow_entry *tun_flow_find(struct hlist_head *head, u32 rxhash)
-- 
2.16.2

Re: [PATCH][net-next] tun: not use hardcoded mask value

[David Miller]

From: Li RongQing <lirongqing@baidu.com>
Date: Fri,  3 Aug 2018 15:50:02 +0800

> 0x3ff in tun_hashfn is mask of TUN_NUM_FLOW_ENTRIES, instead
> of hardcode, define a macro to setup the relationship with
> TUN_NUM_FLOW_ENTRIES
> 
> Signed-off-by: Li RongQing <lirongqing@baidu.com>

Applied, thank you.