leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: partially inline ipv6_fixup_options

Browse Source 
Inline a part of ipv6_fixup_options() to avoid extra overhead on
function call if opt is NULL.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Pavel Begunkov 2022-01-27 00:36:31 +00:00 committed by Jakub Kicinski
parent 40ac240c2e
commit 31ed2261e8
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/ipv6.h
View File

@ -437,9 +437,17 @@ struct ipv6_txoptions *ipv6_renew_options(struct sock *sk,
struct ipv6_txoptions *opt, struct ipv6_txoptions *opt,
int newtype, int newtype,
struct ipv6_opt_hdr *newopt); struct ipv6_opt_hdr *newopt);
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, struct ipv6_txoptions *__ipv6_fixup_options(struct ipv6_txoptions *opt_space,
struct ipv6_txoptions *opt); struct ipv6_txoptions *opt);
static inline struct ipv6_txoptions *
ipv6_fixup_options(struct ipv6_txoptions *opt_space, struct ipv6_txoptions *opt)
{
if (!opt)
return NULL;
return __ipv6_fixup_options(opt_space, opt);
}
bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb, bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb,
const struct inet6_skb_parm *opt); const struct inet6_skb_parm *opt);
struct ipv6_txoptions *ipv6_update_options(struct sock *sk, struct ipv6_txoptions *ipv6_update_options(struct sock *sk,

6
net/ipv6/exthdrs.c
View File

@ -1344,14 +1344,14 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
return opt2; return opt2;
} }
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, struct ipv6_txoptions *__ipv6_fixup_options(struct ipv6_txoptions *opt_space,
struct ipv6_txoptions *opt) struct ipv6_txoptions *opt)
{ {
/* /*
* ignore the dest before srcrt unless srcrt is being included. * ignore the dest before srcrt unless srcrt is being included.
* --yoshfuji * --yoshfuji
*/ */
if (opt && opt->dst0opt && !opt->srcrt) { if (opt->dst0opt && !opt->srcrt) {
if (opt_space != opt) { if (opt_space != opt) {
memcpy(opt_space, opt, sizeof(*opt_space)); memcpy(opt_space, opt, sizeof(*opt_space));
opt = opt_space; opt = opt_space;
@ -1362,7 +1362,7 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
return opt; return opt;
} }
EXPORT_SYMBOL_GPL(ipv6_fixup_options); EXPORT_SYMBOL_GPL(__ipv6_fixup_options);
/** /**
* fl6_update_dst - update flowi destination address with info given * fl6_update_dst - update flowi destination address with info given