Skip to content

Commit

Permalink
net: Init backlog NAPI's gro_hash.
Browse files Browse the repository at this point in the history
Based upon a patch by Sean Tranchetti.

Fixes: d4546c2 ("net: Convert GRO SKB handling to list_head.")
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 21, 2018
1 parent 99d20a4 commit 7c4ec74
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -6115,19 +6115,24 @@ static enum hrtimer_restart napi_watchdog(struct hrtimer *timer)
return HRTIMER_NORESTART;
}

void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight)
static void init_gro_hash(struct napi_struct *napi)
{
int i;

INIT_LIST_HEAD(&napi->poll_list);
hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
napi->timer.function = napi_watchdog;
napi->gro_bitmask = 0;
for (i = 0; i < GRO_HASH_BUCKETS; i++) {
INIT_LIST_HEAD(&napi->gro_hash[i].list);
napi->gro_hash[i].count = 0;
}
napi->gro_bitmask = 0;
}

void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight)
{
INIT_LIST_HEAD(&napi->poll_list);
hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
napi->timer.function = napi_watchdog;
init_gro_hash(napi);
napi->skb = NULL;
napi->poll = poll;
if (weight > NAPI_POLL_WEIGHT)
Expand Down Expand Up @@ -9554,6 +9559,7 @@ static int __init net_dev_init(void)
sd->cpu = i;
#endif

init_gro_hash(&sd->backlog);
sd->backlog.poll = process_backlog;
sd->backlog.weight = weight_p;
}
Expand Down

0 comments on commit 7c4ec74

Please sign in to comment.