diff --git a/[refs] b/[refs] index 5502c965ea01..7b07c9c72386 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db138908ccff404b9920f18f6244f4bff2368c04 +refs/heads/master: 9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec diff --git a/trunk/include/net/ip6_route.h b/trunk/include/net/ip6_route.h index 642a80bb42cf..c850e5fb967c 100644 --- a/trunk/include/net/ip6_route.h +++ b/trunk/include/net/ip6_route.h @@ -70,7 +70,7 @@ static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt) extern void ip6_route_input(struct sk_buff *skb); extern struct dst_entry * ip6_route_output(struct net *net, - struct sock *sk, + const struct sock *sk, struct flowi6 *fl6); extern int ip6_route_init(void); diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 6814c8722fa7..843406f14d7b 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -854,7 +854,7 @@ static struct rt6_info *ip6_pol_route_output(struct net *net, struct fib6_table return ip6_pol_route(net, table, fl6->flowi6_oif, fl6, flags); } -struct dst_entry * ip6_route_output(struct net *net, struct sock *sk, +struct dst_entry * ip6_route_output(struct net *net, const struct sock *sk, struct flowi6 *fl6) { int flags = 0;