aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/net/ip6_route.h20
-rw-r--r--include/net/ipv6.h4
2 files changed, 0 insertions, 24 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index c2626ce1f2ad..1fb6cddbd448 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -51,26 +51,6 @@ static inline unsigned int rt6_flags2srcprefs(int flags)
51 return (flags >> 3) & 7; 51 return (flags >> 3) & 7;
52} 52}
53 53
54void rt6_bind_peer(struct rt6_info *rt, int create);
55
56static inline struct inet_peer *__rt6_get_peer(struct rt6_info *rt, int create)
57{
58 if (rt6_has_peer(rt))
59 return rt6_peer_ptr(rt);
60
61 rt6_bind_peer(rt, create);
62 return (rt6_has_peer(rt) ? rt6_peer_ptr(rt) : NULL);
63}
64
65static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)
66{
67 return __rt6_get_peer(rt, 0);
68}
69
70static inline struct inet_peer *rt6_get_peer_create(struct rt6_info *rt)
71{
72 return __rt6_get_peer(rt, 1);
73}
74 54
75void ip6_route_input(struct sk_buff *skb); 55void ip6_route_input(struct sk_buff *skb);
76 56
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index e600b89811aa..12079c65ea3e 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -267,9 +267,6 @@ void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info);
267int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, 267int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,
268 struct icmp6hdr *thdr, int len); 268 struct icmp6hdr *thdr, int len);
269 269
270struct dst_entry *icmpv6_route_lookup(struct net *net, struct sk_buff *skb,
271 struct sock *sk, struct flowi6 *fl6);
272
273int ip6_ra_control(struct sock *sk, int sel); 270int ip6_ra_control(struct sock *sk, int sel);
274 271
275int ipv6_parse_hopopts(struct sk_buff *skb); 272int ipv6_parse_hopopts(struct sk_buff *skb);
@@ -839,7 +836,6 @@ static inline int snmp6_unregister_dev(struct inet6_dev *idev) { return 0; }
839 836
840#ifdef CONFIG_SYSCTL 837#ifdef CONFIG_SYSCTL
841extern struct ctl_table ipv6_route_table_template[]; 838extern struct ctl_table ipv6_route_table_template[];
842extern struct ctl_table ipv6_icmp_table_template[];
843 839
844struct ctl_table *ipv6_icmp_sysctl_init(struct net *net); 840struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
845struct ctl_table *ipv6_route_sysctl_init(struct net *net); 841struct ctl_table *ipv6_route_sysctl_init(struct net *net);