aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2013-08-28 02:04:14 -0400
committerSteffen Klassert <steffen.klassert@secunet.com>2013-12-06 01:24:39 -0500
commit0e0d44ab4275549998567cd4700b43f7496eb62b (patch)
tree2b508851d3c8c76f7068c519e0b5c8ad31d21eec /net/ipv6/tcp_ipv6.c
parent5b8ef3415a21f173ab115e90ec92c071a03f22d7 (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/ipv6/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0740f93a114a..f14456f40d02 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -258,7 +258,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
258 258
259 security_sk_classify_flow(sk, flowi6_to_flowi(&fl6)); 259 security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
260 260
261 dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true); 261 dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
262 if (IS_ERR(dst)) { 262 if (IS_ERR(dst)) {
263 err = PTR_ERR(dst); 263 err = PTR_ERR(dst);
264 goto failure; 264 goto failure;
@@ -801,7 +801,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
801 * Underlying function will use this to retrieve the network 801 * Underlying function will use this to retrieve the network
802 * namespace 802 * namespace
803 */ 803 */
804 dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL, false); 804 dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);
805 if (!IS_ERR(dst)) { 805 if (!IS_ERR(dst)) {
806 skb_dst_set(buff, dst); 806 skb_dst_set(buff, dst);
807 ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass); 807 ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass);