Skip to content

Commit

Permalink
ipv4: Kill can_sleep arg to ip_route_output_flow()
Browse files Browse the repository at this point in the history 
This boolean state is now available in the flow flags.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Mar 1, 2011
1 parent 5df65e5 commit 273447b
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/cxgb3/iwch_cm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip,
}
};

if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))
if (ip_route_output_flow(&init_net, &rt, &fl, NULL))
return NULL;
return rt;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/infiniband/hw/cxgb4/cm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ static struct rtable *find_route(struct c4iw_dev *dev, __be32 local_ip,
}
};

if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))
if (ip_route_output_flow(&init_net, &rt, &fl, NULL))
return NULL;
return rt;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/cxgbi/libcxgbi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ static struct rtable *find_route_ipv4(__be32 saddr, __be32 daddr,
}
};

if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))
if (ip_route_output_flow(&init_net, &rt, &fl, NULL))
return NULL;

return rt;
Expand Down
6 changes: 3 additions & 3 deletions include/net/route.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ extern void rt_cache_flush(struct net *net, int how);
extern void rt_cache_flush_batch(struct net *net);
extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);
extern int ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);
extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, bool can_sleep);
extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk);

extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin, bool noref);
Expand Down Expand Up @@ -198,7 +198,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
*rp = NULL;
}
security_sk_classify_flow(sk, &fl);
return ip_route_output_flow(net, rp, &fl, sk, can_sleep);
return ip_route_output_flow(net, rp, &fl, sk);
}

static inline int ip_route_newports(struct rtable **rp, u8 protocol,
Expand All @@ -222,7 +222,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol,
ip_rt_put(*rp);
*rp = NULL;
security_sk_classify_flow(sk, &fl);
return ip_route_output_flow(sock_net(sk), rp, &fl, sk, false);
return ip_route_output_flow(sock_net(sk), rp, &fl, sk);
}
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion net/dccp/ipv4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,
};

security_skb_classify_flow(skb, &fl);
if (ip_route_output_flow(net, &rt, &fl, sk, false)) {
if (ip_route_output_flow(net, &rt, &fl, sk)) {
IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/af_inet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ int inet_sk_rebuild_header(struct sock *sk)
};

security_sk_classify_flow(sk, &fl);
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, false);
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk);
}
if (!err)
sk_setup_caps(sk, &rt->dst);
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/inet_connection_sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
struct net *net = sock_net(sk);

security_req_classify_flow(req, &fl);
if (ip_route_output_flow(net, &rt, &fl, sk, false))
if (ip_route_output_flow(net, &rt, &fl, sk))
goto no_route;
if (opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway)
goto route_err;
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/ip_output.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ int ip_queue_xmit(struct sk_buff *skb)
* itself out.
*/
security_sk_classify_flow(sk, &fl);
if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, false))
if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk))
goto no_route;
}
sk_setup_caps(sk, &rt->dst);
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/raw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
}

security_sk_classify_flow(sk, &fl);
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, true);
err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk);
}
if (err)
goto done;
Expand Down
7 changes: 4 additions & 3 deletions net/ipv4/route.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2720,7 +2720,7 @@ static int ipv4_dst_blackhole(struct net *net, struct rtable **rp, struct flowi
}

int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp,
struct sock *sk, bool can_sleep)
struct sock *sk)
{
int err;

Expand All @@ -2733,7 +2733,8 @@ int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp,
if (!flp->fl4_dst)
flp->fl4_dst = (*rp)->rt_dst;
err = __xfrm_lookup(net, (struct dst_entry **)rp, flp, sk,
can_sleep ? XFRM_LOOKUP_WAIT : 0);
((flp->flags & FLOWI_FLAG_CAN_SLEEP) ?
XFRM_LOOKUP_WAIT : 0));
if (err == -EREMOTE)
err = ipv4_dst_blackhole(net, rp, flp);

Expand All @@ -2746,7 +2747,7 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow);

int ip_route_output_key(struct net *net, struct rtable **rp, struct flowi *flp)
{
return ip_route_output_flow(net, rp, flp, NULL, false);
return ip_route_output_flow(net, rp, flp, NULL);
}
EXPORT_SYMBOL(ip_route_output_key);

Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/udp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
struct net *net = sock_net(sk);

security_sk_classify_flow(sk, &fl);
err = ip_route_output_flow(net, &rt, &fl, sk, true);
err = ip_route_output_flow(net, &rt, &fl, sk);
if (err) {
if (err == -ENETUNREACH)
IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
Expand Down
2 changes: 1 addition & 1 deletion net/l2tp/l2tp_ip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
* itself out.
*/
security_sk_classify_flow(sk, &fl);
if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, false))
if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk))
goto no_route;
}
sk_setup_caps(sk, &rt->dst);
Expand Down

0 comments on commit 273447b

Please sign in to comment.