diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-11 10:34:03 -0600 |
| commit | febbb25c8856bfe03e2a06b3f88e69f7d9d10b81 (patch) | |
| tree | b89154f29c52cf14fcef442ea4df3164e62dd7a6 /include/net/ip6_route.h | |
| parent | 5765ecb5ef2401f7bd0feaeeadbe6dbc558b9791 (diff) | |
| parent | 4e77f7f1261f65cff06918bc5e66d02a418fc842 (diff) | |
Merge tag 'v3.10.18' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.18-2013.11
This is the 3.10.18 stable release
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 260f83f16bcf..b906f4a131a4 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -194,11 +194,9 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb) skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb)); } -static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest) +static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt) { - if (rt->rt6i_flags & RTF_GATEWAY) - return &rt->rt6i_gateway; - return dest; + return &rt->rt6i_gateway; } #endif |