iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gro: give 'hash' variable in dev_gro_receive() a less confusing name

Browse Source 
'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>
This commit is contained in:
Alexander Lobakin 2021-03-13 20:30:14 +00:00 committed by David S. Miller
parent 9dc2c31337
commit d0eed5c325
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/core/dev.c
View 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) 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 gro_list *gro_list = &napi->gro_hash[hash]; struct gro_list *gro_list = &napi->gro_hash[bucket];
struct list_head *head = &offload_base; struct list_head *head = &offload_base;
struct packet_offload *ptype; struct packet_offload *ptype;
__be16 type = skb->protocol; __be16 type = skb->protocol;
@ -6047,10 +6047,10 @@ pull:
gro_pull_from_frag0(skb, grow); gro_pull_from_frag0(skb, grow);
ok: ok:
if (gro_list->count) { if (gro_list->count) {
if (!test_bit(hash, &napi->gro_bitmask)) if (!test_bit(bucket, &napi->gro_bitmask))
__set_bit(hash, &napi->gro_bitmask); __set_bit(bucket, &napi->gro_bitmask);
} else if (test_bit(hash, &napi->gro_bitmask)) { } else if (test_bit(bucket, &napi->gro_bitmask)) {
__clear_bit(hash, &napi->gro_bitmask); __clear_bit(bucket, &napi->gro_bitmask);
} }
return ret; return ret;