diff options
| author |   Lorenzo Colitti <lorenzo@google.com> | 2014-04-29 11:57:34 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-04-30 13:31:26 -0400 |
| commit | 5c98631cca574ac6255885cf372f6bcf9dcfd483 (patch) | |
| tree | 53e82fe083c0db2aeca000e70872f1d01e0b4146 /net/ipv6/icmp.c | |
| parent | net: dsa: update DSA drivers to use ds_to_priv (diff) | |
| download | linux-dev-5c98631cca574ac6255885cf372f6bcf9dcfd483.tar.xz linux-dev-5c98631cca574ac6255885cf372f6bcf9dcfd483.zip | |
net: ipv6: Introduce ip6_sk_dst_hoplimit.
This replaces 6 identical code snippets with a call to a new
static inline function.
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 7b326529e6a2..3b0905b77127 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -493,12 +493,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info) if (IS_ERR(dst)) goto out; - if (ipv6_addr_is_multicast(&fl6.daddr)) - hlimit = np->mcast_hops; - else - hlimit = np->hop_limit; - if (hlimit < 0) - hlimit = ip6_dst_hoplimit(dst); + hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst); msg.skb = skb; msg.offset = skb_network_offset(skb); @@ -593,12 +588,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) if (IS_ERR(dst)) goto out; - if (ipv6_addr_is_multicast(&fl6.daddr)) - hlimit = np->mcast_hops; - else - hlimit = np->hop_limit; - if (hlimit < 0) - hlimit = ip6_dst_hoplimit(dst); + hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst); idev = __in6_dev_get(skb->dev); |