From d52890e01a580ce984cb2e84973de8575a7540ad Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Tue, 22 Mar 2011 19:17:36 -0700
Subject: [PATCH] --- yaml --- r: 242623 b: refs/heads/master c:
 9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec h: refs/heads/master i:   242621:
 4e5a137be0585a03a4feb0eae7278db3faa251d4   242619:
 b43eeeefaedef8ea6546d89a4166e648a794fa98   242615:
 f540eb40a6904597fe3bdafbb70f962ce142a317   242607:
 fc788a4e5489eaedf91ef62dcf8df2382278efac   242591:
 12b4b44375f5a1b57a1cdfc6f1e90f5256d915f9   242559:
 c88e0648c470f260beb76d6873e4b3783768450b v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/ip6_route.h | 2 +-
 trunk/net/ipv6/route.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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;