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/ipv4 | |
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/ipv4')
-rw-r--r-- | net/ipv4/af_inet.c | 2 | ||||
-rw-r--r-- | net/ipv4/datagram.c | 2 | ||||
-rw-r--r-- | net/ipv4/raw.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 70011e029ac1..4f6d50bda093 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1133,7 +1133,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) | |||
1133 | fl4 = &inet->cork.fl.u.ip4; | 1133 | fl4 = &inet->cork.fl.u.ip4; |
1134 | rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk), | 1134 | rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk), |
1135 | sk->sk_bound_dev_if, sk->sk_protocol, | 1135 | sk->sk_bound_dev_if, sk->sk_protocol, |
1136 | inet->inet_sport, inet->inet_dport, sk, false); | 1136 | inet->inet_sport, inet->inet_dport, sk); |
1137 | if (IS_ERR(rt)) | 1137 | if (IS_ERR(rt)) |
1138 | return PTR_ERR(rt); | 1138 | return PTR_ERR(rt); |
1139 | 1139 | ||
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index 19e36376d2a0..8b5134c582f1 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c | |||
@@ -53,7 +53,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
53 | rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr, | 53 | rt = ip_route_connect(fl4, usin->sin_addr.s_addr, saddr, |
54 | RT_CONN_FLAGS(sk), oif, | 54 | RT_CONN_FLAGS(sk), oif, |
55 | sk->sk_protocol, | 55 | sk->sk_protocol, |
56 | inet->inet_sport, usin->sin_port, sk, true); | 56 | inet->inet_sport, usin->sin_port, sk); |
57 | if (IS_ERR(rt)) { | 57 | if (IS_ERR(rt)) { |
58 | err = PTR_ERR(rt); | 58 | err = PTR_ERR(rt); |
59 | if (err == -ENETUNREACH) | 59 | if (err == -ENETUNREACH) |
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 23c3e5b5bb53..81e6cfd5a365 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
@@ -575,7 +575,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
575 | flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos, | 575 | flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos, |
576 | RT_SCOPE_UNIVERSE, | 576 | RT_SCOPE_UNIVERSE, |
577 | inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol, | 577 | inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol, |
578 | inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP | | 578 | inet_sk_flowi_flags(sk) | |
579 | (inet->hdrincl ? FLOWI_FLAG_KNOWN_NH : 0), | 579 | (inet->hdrincl ? FLOWI_FLAG_KNOWN_NH : 0), |
580 | daddr, saddr, 0, 0); | 580 | daddr, saddr, 0, 0); |
581 | 581 | ||
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 067213924751..bbaf8cb45eb2 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -173,7 +173,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
173 | rt = ip_route_connect(fl4, nexthop, inet->inet_saddr, | 173 | rt = ip_route_connect(fl4, nexthop, inet->inet_saddr, |
174 | RT_CONN_FLAGS(sk), sk->sk_bound_dev_if, | 174 | RT_CONN_FLAGS(sk), sk->sk_bound_dev_if, |
175 | IPPROTO_TCP, | 175 | IPPROTO_TCP, |
176 | orig_sport, orig_dport, sk, true); | 176 | orig_sport, orig_dport, sk); |
177 | if (IS_ERR(rt)) { | 177 | if (IS_ERR(rt)) { |
178 | err = PTR_ERR(rt); | 178 | err = PTR_ERR(rt); |
179 | if (err == -ENETUNREACH) | 179 | if (err == -ENETUNREACH) |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 44f6a20fa29d..480fb95df2b6 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -990,7 +990,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
990 | fl4 = &fl4_stack; | 990 | fl4 = &fl4_stack; |
991 | flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos, | 991 | flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos, |
992 | RT_SCOPE_UNIVERSE, sk->sk_protocol, | 992 | RT_SCOPE_UNIVERSE, sk->sk_protocol, |
993 | inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP, | 993 | inet_sk_flowi_flags(sk), |
994 | faddr, saddr, dport, inet->inet_sport); | 994 | faddr, saddr, dport, inet->inet_sport); |
995 | 995 | ||
996 | security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); | 996 | security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); |