diff options
| author | Florian Westphal <fw@strlen.de> | 2011-03-22 19:17:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-22 19:17:36 -0700 |
| commit | 9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec (patch) | |
| tree | 5286988a4c78be842ea164c24e1acf932d19b4a0 | |
| parent | db138908ccff404b9920f18f6244f4bff2368c04 (diff) | |
| download | op-kernel-dev-9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec.zip op-kernel-dev-9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec.tar.gz | |
ipv6: ip6_route_output does not modify sk parameter, so make it const
This avoids explicit cast to avoid 'discards qualifiers'
compiler warning in a netfilter patch that i've been working on.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ip6_route.h | 2 | ||||
| -rw-r--r-- | net/ipv6/route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 642a80b..c850e5f 100644 --- a/include/net/ip6_route.h +++ b/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/net/ipv6/route.c b/net/ipv6/route.c index 6814c87..843406f 100644 --- a/net/ipv6/route.c +++ b/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; |
