Commit d0eed5c3 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller

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

'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: default avatarAlexander Lobakin <alobakin@pm.me>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dc2c313
...@@ -5952,8 +5952,8 @@ static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head) ...@@ -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 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff ...@@ -6047,10 +6047,10 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment