summaryrefslogtreecommitdiff
path: root/net/8021q
diff options
context:
space:
mode:
authorRichard Gobert <richardbgobert@gmail.com>2022-08-23 09:10:49 +0200
committerPaolo Abeni <pabeni@redhat.com>2022-08-25 10:33:21 +0200
commit35ffb66547295c72650978f9c28e670e014d0957 (patch)
tree3574eb3f37289369144d96eaf0efb2eae226e989 /net/8021q
parent77a70f9c5b8678218a51cf2ae39a52cb4b6bc16c (diff)
net: gro: skb_gro_header helper function
Introduce a simple helper function to replace a common pattern. When accessing the GRO header, we fetch the pointer from frag0, then test its validity and fetch it from the skb when necessary. This leads to the pattern skb_gro_header_fast -> skb_gro_header_hard -> skb_gro_header_slow recurring many times throughout GRO code. This patch replaces these patterns with a single inlined function call, improving code readability. Signed-off-by: Richard Gobert <richardbgobert@gmail.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20220823071034.GA56142@debian Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_core.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 5aa8144101dc..0beb44f2fe1f 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -467,12 +467,9 @@ static struct sk_buff *vlan_gro_receive(struct list_head *head,
off_vlan = skb_gro_offset(skb);
hlen = off_vlan + sizeof(*vhdr);
- vhdr = skb_gro_header_fast(skb, off_vlan);
- if (skb_gro_header_hard(skb, hlen)) {
- vhdr = skb_gro_header_slow(skb, hlen, off_vlan);
- if (unlikely(!vhdr))
- goto out;
- }
+ vhdr = skb_gro_header(skb, hlen, off_vlan);
+ if (unlikely(!vhdr))
+ goto out;
type = vhdr->h_vlan_encapsulated_proto;