ipv6: Stop rt6_info from using inet_peer's metrics

[mirror_ubuntu-artful-kernel.git] / include / net / ip6_fib.h

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 20e80fa7bbdd5a0effd39ed6761ac167912f7da3..7383a8cc8f845387aa0aadf8790bcef11b7e22d3 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -124,6 +124,7 @@ struct rt6_info {
        unsigned long                   _rt6i_peer;
 
        u32                             rt6i_metric;
+       u32                             rt6i_pmtu;
        /* more non-fragment space at head required */
        unsigned short                  rt6i_nfheader_len;
        u8                              rt6i_protocol;
@@ -189,15 +190,6 @@ static inline void rt6_update_expires(struct rt6_info *rt0, int timeout)
        rt0->rt6i_flags |= RTF_EXPIRES;
 }
 
-static inline void rt6_set_from(struct rt6_info *rt, struct rt6_info *from)
-{
-       struct dst_entry *new = (struct dst_entry *) from;
-
-       rt->rt6i_flags &= ~RTF_EXPIRES;
-       dst_hold(new);
-       rt->dst.from = new;
-}
-
 static inline void ip6_rt_put(struct rt6_info *rt)
 {
        /* dst_release() accepts a NULL parameter.