lkml.org 
[lkml]   [2022]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v3 07/10] ipv6: partially inline fl6_update_dst()
    Date
    fl6_update_dst() doesn't do anything when there are no opts passed.
    Inline the null checking part.

    Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
    ---
    include/net/ipv6.h | 15 ++++++++++++---
    net/ipv6/exthdrs.c | 15 ++++++---------
    2 files changed, 18 insertions(+), 12 deletions(-)

    diff --git a/include/net/ipv6.h b/include/net/ipv6.h
    index 30a3447e34b4..b9848fcd6954 100644
    --- a/include/net/ipv6.h
    +++ b/include/net/ipv6.h
    @@ -1094,9 +1094,18 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset, int target,

    int ipv6_find_tlv(const struct sk_buff *skb, int offset, int type);

    -struct in6_addr *fl6_update_dst(struct flowi6 *fl6,
    - const struct ipv6_txoptions *opt,
    - struct in6_addr *orig);
    +struct in6_addr *__fl6_update_dst(struct flowi6 *fl6,
    + const struct ipv6_txoptions *opt,
    + struct in6_addr *orig);
    +
    +static inline struct in6_addr *fl6_update_dst(struct flowi6 *fl6,
    + const struct ipv6_txoptions *opt,
    + struct in6_addr *orig)
    +{
    + if (!opt || !opt->srcrt)
    + return NULL;
    + return __fl6_update_dst(fl6, opt, orig);
    +}

    /*
    * socket options (ipv6_sockglue.c)
    diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
    index a8d961d3a477..d02c27d4f2c2 100644
    --- a/net/ipv6/exthdrs.c
    +++ b/net/ipv6/exthdrs.c
    @@ -1367,8 +1367,8 @@ struct ipv6_txoptions *__ipv6_fixup_options(struct ipv6_txoptions *opt_space,
    EXPORT_SYMBOL_GPL(__ipv6_fixup_options);

    /**
    - * fl6_update_dst - update flowi destination address with info given
    - * by srcrt option, if any.
    + * __fl6_update_dst - update flowi destination address with info given
    + * by srcrt option.
    *
    * @fl6: flowi6 for which daddr is to be updated
    * @opt: struct ipv6_txoptions in which to look for srcrt opt
    @@ -1377,13 +1377,10 @@ EXPORT_SYMBOL_GPL(__ipv6_fixup_options);
    * Returns NULL if no txoptions or no srcrt, otherwise returns orig
    * and initial value of fl6->daddr set in orig
    */
    -struct in6_addr *fl6_update_dst(struct flowi6 *fl6,
    - const struct ipv6_txoptions *opt,
    - struct in6_addr *orig)
    +struct in6_addr *__fl6_update_dst(struct flowi6 *fl6,
    + const struct ipv6_txoptions *opt,
    + struct in6_addr *orig)
    {
    - if (!opt || !opt->srcrt)
    - return NULL;
    -
    *orig = fl6->daddr;

    switch (opt->srcrt->type) {
    @@ -1405,4 +1402,4 @@ struct in6_addr *fl6_update_dst(struct flowi6 *fl6,

    return orig;
    }
    -EXPORT_SYMBOL_GPL(fl6_update_dst);
    +EXPORT_SYMBOL_GPL(__fl6_update_dst);
    --
    2.36.0
    \
     
     \ /
      Last update: 2022-05-13 17:28    [W:3.648 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site