net: use indirect calls helpers for ptype hook

This avoids an indirect call per RX IPv6/IPv4 packet.
Note that we don't want to use the indirect calls helper for taps.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni 2019-05-03 17:01:36 +02:00 committed by David S. Miller
parent b52d031b8d
commit f5737cbadb
1 changed files with 4 additions and 2 deletions

View File

@ -4987,7 +4987,8 @@ static int __netif_receive_skb_one_core(struct sk_buff *skb, bool pfmemalloc)
ret = __netif_receive_skb_core(skb, pfmemalloc, &pt_prev); ret = __netif_receive_skb_core(skb, pfmemalloc, &pt_prev);
if (pt_prev) if (pt_prev)
ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev); ret = INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb,
skb->dev, pt_prev, orig_dev);
return ret; return ret;
} }
@ -5033,7 +5034,8 @@ static inline void __netif_receive_skb_list_ptype(struct list_head *head,
else else
list_for_each_entry_safe(skb, next, head, list) { list_for_each_entry_safe(skb, next, head, list) {
skb_list_del_init(skb); skb_list_del_init(skb);
pt_prev->func(skb, skb->dev, pt_prev, orig_dev); INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb,
skb->dev, pt_prev, orig_dev);
} }
} }