[PATCH net-next 1/4] gro: give 'hash' variable in dev_gro_receive() a less confusing name

[Alexander Lobakin]

'hash' stores not the flow hash, but the index of the GRO bucket
corresponding to it.
Change its name to 'bucket' to avoid confusion while reading lines
like '__set_bit(hash, &napi->gro_bitmask)'.

Signed-off-by: Alexander Lobakin <aloba...@pm.me>
---
 net/core/dev.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index 2bfdd528c7c3..adc42ba7ffd8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5956,7 +5956,7 @@ static void gro_flush_oldest(struct napi_struct *napi, 
struct list_head *head)

 static enum gro_result dev_gro_receive(struct napi_struct *napi, struct 
sk_buff *skb)
 {
-       u32 hash = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);
+       u32 bucket = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);
        struct list_head *head = &offload_base;
        struct packet_offload *ptype;
        __be16 type = skb->protocol;
@@ -6024,7 +6024,7 @@ static enum gro_result dev_gro_receive(struct napi_struct 
*napi, struct sk_buff
        if (pp) {
                skb_list_del_init(pp);
                napi_gro_complete(napi, pp);
-               napi->gro_hash[hash].count--;
+               napi->gro_hash[bucket].count--;
        }

        if (same_flow)
@@ -6033,10 +6033,10 @@ static enum gro_result dev_gro_receive(struct 
napi_struct *napi, struct sk_buff
        if (NAPI_GRO_CB(skb)->flush)
                goto normal;

-       if (unlikely(napi->gro_hash[hash].count >= MAX_GRO_SKBS)) {
+       if (unlikely(napi->gro_hash[bucket].count >= MAX_GRO_SKBS)) {
                gro_flush_oldest(napi, gro_head);
        } else {
-               napi->gro_hash[hash].count++;
+               napi->gro_hash[bucket].count++;
        }
        NAPI_GRO_CB(skb)->count = 1;
        NAPI_GRO_CB(skb)->age = jiffies;
@@ -6050,11 +6050,11 @@ static enum gro_result dev_gro_receive(struct 
napi_struct *napi, struct sk_buff
        if (grow > 0)
                gro_pull_from_frag0(skb, grow);
 ok:
-       if (napi->gro_hash[hash].count) {
-               if (!test_bit(hash, &napi->gro_bitmask))
-                       __set_bit(hash, &napi->gro_bitmask);
-       } else if (test_bit(hash, &napi->gro_bitmask)) {
-               __clear_bit(hash, &napi->gro_bitmask);
+       if (napi->gro_hash[bucket].count) {
+               if (!test_bit(bucket, &napi->gro_bitmask))
+                       __set_bit(bucket, &napi->gro_bitmask);
+       } else if (test_bit(bucket, &napi->gro_bitmask)) {
+               __clear_bit(bucket, &napi->gro_bitmask);
        }

        return ret;
--
2.30.2