gro: give 'hash' variable in dev_gro_receive() a less confusing name
authorAlexander Lobakin <alobakin@pm.me>
Sat, 13 Mar 2021 20:30:14 +0000 (20:30 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 14 Mar 2021 21:41:09 +0000 (14:41 -0700)
'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 <alobakin@pm.me>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index b635467..5a2847a 100644 (file)
@@ -5952,8 +5952,8 @@ 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);
-       struct gro_list *gro_list = &napi->gro_hash[hash];
+       u32 bucket = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);
+       struct gro_list *gro_list = &napi->gro_hash[bucket];
        struct list_head *head = &offload_base;
        struct packet_offload *ptype;
        __be16 type = skb->protocol;
@@ -6047,10 +6047,10 @@ pull:
                gro_pull_from_frag0(skb, grow);
 ok:
        if (gro_list->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 (!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;