mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 16:13:19 +09:00
ipv4: Constify the sk parameter of ip_route_output_*().
These functions don't need to modify the socket, so let's allow the callers to pass a const struct sock *. Signed-off-by: Guillaume Nault <gnault@redhat.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Reviewed-by: David Ahern <dsahern@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
5b52ad34f9
commit
8d6eba33a2
@@ -163,7 +163,7 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi4 *fl4,
|
static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi4 *fl4,
|
||||||
struct sock *sk,
|
const struct sock *sk,
|
||||||
__be32 daddr, __be32 saddr,
|
__be32 daddr, __be32 saddr,
|
||||||
__be16 dport, __be16 sport,
|
__be16 dport, __be16 sport,
|
||||||
__u8 proto, __u8 tos, int oif)
|
__u8 proto, __u8 tos, int oif)
|
||||||
@@ -309,7 +309,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst,
|
|||||||
static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst,
|
static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst,
|
||||||
__be32 src, int oif, u8 protocol,
|
__be32 src, int oif, u8 protocol,
|
||||||
__be16 sport, __be16 dport,
|
__be16 sport, __be16 dport,
|
||||||
struct sock *sk)
|
const struct sock *sk)
|
||||||
{
|
{
|
||||||
struct net *net = sock_net(sk);
|
struct net *net = sock_net(sk);
|
||||||
struct rtable *rt;
|
struct rtable *rt;
|
||||||
@@ -330,7 +330,7 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4, __be32 dst,
|
|||||||
static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable *rt,
|
static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable *rt,
|
||||||
__be16 orig_sport, __be16 orig_dport,
|
__be16 orig_sport, __be16 orig_dport,
|
||||||
__be16 sport, __be16 dport,
|
__be16 sport, __be16 dport,
|
||||||
struct sock *sk)
|
const struct sock *sk)
|
||||||
{
|
{
|
||||||
if (sport != orig_sport || dport != orig_dport) {
|
if (sport != orig_sport || dport != orig_dport) {
|
||||||
fl4->fl4_dport = dport;
|
fl4->fl4_dport = dport;
|
||||||
|
|||||||
Reference in New Issue
Block a user