hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipv6: Change final dst lookup arg name to "can_sleep" 

Since it indicates whether we are invoked from a sleepable
context or not.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-03-01 14:32:04 -08:00
parent 273447b352
commit a1414715f0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/ipv6.h
View File

@ -515,11 +515,11 @@ extern int ip6_dst_lookup(struct sock *sk,
extern struct dst_entry * ip6_dst_lookup_flow(struct sock *sk, extern struct dst_entry * ip6_dst_lookup_flow(struct sock *sk,
struct flowi *fl, struct flowi *fl,
const struct in6_addr *final_dst, const struct in6_addr *final_dst,
bool want_blackhole); bool can_sleep);
extern struct dst_entry * ip6_sk_dst_lookup_flow(struct sock *sk, extern struct dst_entry * ip6_sk_dst_lookup_flow(struct sock *sk,
struct flowi *fl, struct flowi *fl,
const struct in6_addr *final_dst, const struct in6_addr *final_dst,
bool want_blackhole); bool can_sleep);
extern int ip6_dst_blackhole(struct sock *sk, extern int ip6_dst_blackhole(struct sock *sk,
struct dst_entry **dst, struct dst_entry **dst,
struct flowi *fl); struct flowi *fl);

12
net/ipv6/ip6_output.c
View File

@ -1006,7 +1006,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
* @sk: socket which provides route info * @sk: socket which provides route info
* @fl: flow to lookup * @fl: flow to lookup
* @final_dst: final destination address for ipsec lookup * @final_dst: final destination address for ipsec lookup
* @want_blackhole: IPSEC blackhole handling desired * @can_sleep: we are in a sleepable context
* *
* This function performs a route lookup on the given flow. * This function performs a route lookup on the given flow.
* *
@ -1015,7 +1015,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
*/ */
struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl, struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
const struct in6_addr *final_dst, const struct in6_addr *final_dst,
bool want_blackhole) bool can_sleep)
{ {
struct dst_entry *dst = NULL; struct dst_entry *dst = NULL;
int err; int err;
@ -1025,7 +1025,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
return ERR_PTR(err); return ERR_PTR(err);
if (final_dst) if (final_dst)
ipv6_addr_copy(&fl->fl6_dst, final_dst); ipv6_addr_copy(&fl->fl6_dst, final_dst);
if (want_blackhole) { if (can_sleep) {
fl->flags |= FLOWI_FLAG_CAN_SLEEP; fl->flags |= FLOWI_FLAG_CAN_SLEEP;
err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT); err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
if (err == -EREMOTE) if (err == -EREMOTE)
@ -1046,7 +1046,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
* @sk: socket which provides the dst cache and route info * @sk: socket which provides the dst cache and route info
* @fl: flow to lookup * @fl: flow to lookup
* @final_dst: final destination address for ipsec lookup * @final_dst: final destination address for ipsec lookup
* @want_blackhole: IPSEC blackhole handling desired * @can_sleep: we are in a sleepable context
* *
* This function performs a route lookup on the given flow with the * This function performs a route lookup on the given flow with the
* possibility of using the cached route in the socket if it is valid. * possibility of using the cached route in the socket if it is valid.
@ -1058,7 +1058,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
*/ */
struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl, struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
const struct in6_addr *final_dst, const struct in6_addr *final_dst,
bool want_blackhole) bool can_sleep)
{ {
struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie); struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
int err; int err;
@ -1070,7 +1070,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
return ERR_PTR(err); return ERR_PTR(err);
if (final_dst) if (final_dst)
ipv6_addr_copy(&fl->fl6_dst, final_dst); ipv6_addr_copy(&fl->fl6_dst, final_dst);
if (want_blackhole) { if (can_sleep) {
fl->flags |= FLOWI_FLAG_CAN_SLEEP; fl->flags |= FLOWI_FLAG_CAN_SLEEP;
err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT); err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
if (err == -EREMOTE) if (err == -EREMOTE)