diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-13 15:01:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-13 15:01:00 -0400 |
| commit | f22f5f6060584ac66a7a43f644788fda8fc7b1f8 (patch) | |
| tree | 057defd0704c2fcb6500c062037f2657710b73e2 /drivers/net/geneve.c | |
| parent | 3a8befcd7872f572882ad7e14994a17f9b55dd4e (diff) | |
| parent | 338039635d01524090e7bd706a3e555e20d5b337 (diff) | |
Merge branch 'net-minor-cleanups-and-optimizations'
Alexander Duyck says:
====================
A couple of minor clean-ups and optimizations
This patch series is basically just a v2 of a couple patches I recently
submitted.
The two patches aren't technically related but there are just items I found
while cleaning up and prepping some further work to enable Tx checksums for
tunnels.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/geneve.c')
| -rw-r--r-- | drivers/net/geneve.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 33185b9a435e..192631a345df 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -463,8 +463,6 @@ static struct sk_buff **geneve_gro_receive(struct sk_buff **head, goto out; } - flush = 0; - for (p = *head; p; p = p->next) { if (!NAPI_GRO_CB(p)->same_flow) continue; @@ -481,14 +479,13 @@ static struct sk_buff **geneve_gro_receive(struct sk_buff **head, rcu_read_lock(); ptype = gro_find_receive_by_type(type); - if (!ptype) { - flush = 1; + if (!ptype) goto out_unlock; - } skb_gro_pull(skb, gh_len); skb_gro_postpull_rcsum(skb, gh, gh_len); pp = ptype->callbacks.gro_receive(head, skb); + flush = 0; out_unlock: rcu_read_unlock(); |