diff options
author | Arnaud Ebalard <arno@natisbad.org> | 2010-06-01 21:35:01 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-02 07:08:31 -0700 |
commit | 20c59de2e6b6bc74bbf714dcd4e720afe8d516cf (patch) | |
tree | 45e5c62e286368f8259b844cb7cf796d19066fb0 /net/ipv6/exthdrs.c | |
parent | d92222e27fdc98d73df25f3d49fb1ff3a3369bec (diff) | |
download | kernel_goldelico_gta04-20c59de2e6b6bc74bbf714dcd4e720afe8d516cf.zip kernel_goldelico_gta04-20c59de2e6b6bc74bbf714dcd4e720afe8d516cf.tar.gz kernel_goldelico_gta04-20c59de2e6b6bc74bbf714dcd4e720afe8d516cf.tar.bz2 |
ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option
There are more than a dozen occurrences of following code in the
IPv6 stack:
if (opt && opt->srcrt) {
struct rt0_hdr *rt0 = (struct rt0_hdr *) opt->srcrt;
ipv6_addr_copy(&final, &fl.fl6_dst);
ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
final_p = &final;
}
Replace those with a helper. Note that the helper overrides final_p
in all cases. This is ok as final_p was previously initialized to
NULL when declared.
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/exthdrs.c')
-rw-r--r-- | net/ipv6/exthdrs.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 8a659f9..853a633 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -874,3 +874,27 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, return opt; } +/** + * fl6_update_dst - update flowi destination address with info given + * by srcrt option, if any. + * + * @fl: flowi for which fl6_dst is to be updated + * @opt: struct ipv6_txoptions in which to look for srcrt opt + * @orig: copy of original fl6_dst address if modified + * + * Returns NULL if no txoptions or no srcrt, otherwise returns orig + * and initial value of fl->fl6_dst set in orig + */ +struct in6_addr *fl6_update_dst(struct flowi *fl, + const struct ipv6_txoptions *opt, + struct in6_addr *orig) +{ + if (!opt || !opt->srcrt) + return NULL; + + ipv6_addr_copy(orig, &fl->fl6_dst); + ipv6_addr_copy(&fl->fl6_dst, ((struct rt0_hdr *)opt->srcrt)->addr); + return orig; +} + +EXPORT_SYMBOL_GPL(fl6_update_dst); |