From: Paolo Abeni Date: Fri, 3 May 2019 15:01:36 +0000 (+0200) Subject: net: use indirect calls helpers for ptype hook X-Git-Tag: v5.2-rc1~133^2~33^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f5737cbadb7d07c4f71fc5f073ccc7d8d8985a8f;p=users%2Fdwmw2%2Flinux.git 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 Signed-off-by: David S. Miller --- diff --git a/net/core/dev.c b/net/core/dev.c index 22f2640f559a3..108ac8137b9be 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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); 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; } @@ -5033,7 +5034,8 @@ static inline void __netif_receive_skb_list_ptype(struct list_head *head, else list_for_each_entry_safe(skb, next, head, list) { 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); } }