diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2013-08-28 02:04:14 -0400 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2013-12-06 01:24:39 -0500 |
commit | 0e0d44ab4275549998567cd4700b43f7496eb62b (patch) | |
tree | 2b508851d3c8c76f7068c519e0b5c8ad31d21eec /net/dccp/ipv6.c | |
parent | 5b8ef3415a21f173ab115e90ec92c071a03f22d7 (diff) |
net: Remove FLOWI_FLAG_CAN_SLEEP
FLOWI_FLAG_CAN_SLEEP was used to notify xfrm about the posibility
to sleep until the needed states are resolved. This code is gone,
so FLOWI_FLAG_CAN_SLEEP is not needed anymore.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 4ac71ff7c2e4..699a2d2a35ea 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -237,7 +237,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) | |||
237 | 237 | ||
238 | final_p = fl6_update_dst(&fl6, np->opt, &final); | 238 | final_p = fl6_update_dst(&fl6, np->opt, &final); |
239 | 239 | ||
240 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false); | 240 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p); |
241 | if (IS_ERR(dst)) { | 241 | if (IS_ERR(dst)) { |
242 | err = PTR_ERR(dst); | 242 | err = PTR_ERR(dst); |
243 | dst = NULL; | 243 | dst = NULL; |
@@ -301,7 +301,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) | |||
301 | security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6)); | 301 | security_skb_classify_flow(rxskb, flowi6_to_flowi(&fl6)); |
302 | 302 | ||
303 | /* sk = NULL, but it is safe for now. RST socket required. */ | 303 | /* sk = NULL, but it is safe for now. RST socket required. */ |
304 | dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL, false); | 304 | dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL); |
305 | if (!IS_ERR(dst)) { | 305 | if (!IS_ERR(dst)) { |
306 | skb_dst_set(skb, dst); | 306 | skb_dst_set(skb, dst); |
307 | ip6_xmit(ctl_sk, skb, &fl6, NULL, 0); | 307 | ip6_xmit(ctl_sk, skb, &fl6, NULL, 0); |
@@ -512,7 +512,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, | |||
512 | fl6.fl6_sport = htons(ireq->ir_num); | 512 | fl6.fl6_sport = htons(ireq->ir_num); |
513 | security_sk_classify_flow(sk, flowi6_to_flowi(&fl6)); | 513 | security_sk_classify_flow(sk, flowi6_to_flowi(&fl6)); |
514 | 514 | ||
515 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false); | 515 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p); |
516 | if (IS_ERR(dst)) | 516 | if (IS_ERR(dst)) |
517 | goto out; | 517 | goto out; |
518 | } | 518 | } |
@@ -932,7 +932,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, | |||
932 | 932 | ||
933 | final_p = fl6_update_dst(&fl6, np->opt, &final); | 933 | final_p = fl6_update_dst(&fl6, np->opt, &final); |
934 | 934 | ||
935 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true); | 935 | dst = ip6_dst_lookup_flow(sk, &fl6, final_p); |
936 | if (IS_ERR(dst)) { | 936 | if (IS_ERR(dst)) { |
937 | err = PTR_ERR(dst); | 937 | err = PTR_ERR(dst); |
938 | goto failure; | 938 | goto failure; |