diff options
author | Alexey Kodanev <alexey.kodanev@oracle.com> | 2018-04-03 08:00:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-04 11:31:57 -0400 |
commit | 9f542f616c24f7d85a4bde42ec621e8d87478fd8 (patch) | |
tree | 7aa25ad97709e84390dc6ecb94d5954b8b47b788 | |
parent | 96818159c3c08911330e84f86b3becf71aeeaac8 (diff) |
ipv6: udp: convert 'connected' to bool type in udpv6_sendmsg()
This should make it consistent with ip6_sk_dst_lookup_flow()
that is accepting the new 'connected' parameter of type bool.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/udp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index fc13a1e2d789..94861abbea60 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -1116,10 +1116,10 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) | |||
1116 | struct dst_entry *dst; | 1116 | struct dst_entry *dst; |
1117 | struct ipcm6_cookie ipc6; | 1117 | struct ipcm6_cookie ipc6; |
1118 | int addr_len = msg->msg_namelen; | 1118 | int addr_len = msg->msg_namelen; |
1119 | bool connected = false; | ||
1119 | int ulen = len; | 1120 | int ulen = len; |
1120 | int corkreq = up->corkflag || msg->msg_flags&MSG_MORE; | 1121 | int corkreq = up->corkflag || msg->msg_flags&MSG_MORE; |
1121 | int err; | 1122 | int err; |
1122 | int connected = 0; | ||
1123 | int is_udplite = IS_UDPLITE(sk); | 1123 | int is_udplite = IS_UDPLITE(sk); |
1124 | int (*getfrag)(void *, char *, int, int, int, struct sk_buff *); | 1124 | int (*getfrag)(void *, char *, int, int, int, struct sk_buff *); |
1125 | struct sockcm_cookie sockc; | 1125 | struct sockcm_cookie sockc; |
@@ -1241,7 +1241,7 @@ do_udp_sendmsg: | |||
1241 | fl6.fl6_dport = inet->inet_dport; | 1241 | fl6.fl6_dport = inet->inet_dport; |
1242 | daddr = &sk->sk_v6_daddr; | 1242 | daddr = &sk->sk_v6_daddr; |
1243 | fl6.flowlabel = np->flow_label; | 1243 | fl6.flowlabel = np->flow_label; |
1244 | connected = 1; | 1244 | connected = true; |
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | if (!fl6.flowi6_oif) | 1247 | if (!fl6.flowi6_oif) |
@@ -1271,7 +1271,7 @@ do_udp_sendmsg: | |||
1271 | } | 1271 | } |
1272 | if (!(opt->opt_nflen|opt->opt_flen)) | 1272 | if (!(opt->opt_nflen|opt->opt_flen)) |
1273 | opt = NULL; | 1273 | opt = NULL; |
1274 | connected = 0; | 1274 | connected = false; |
1275 | } | 1275 | } |
1276 | if (!opt) { | 1276 | if (!opt) { |
1277 | opt = txopt_get(np); | 1277 | opt = txopt_get(np); |
@@ -1293,11 +1293,11 @@ do_udp_sendmsg: | |||
1293 | 1293 | ||
1294 | final_p = fl6_update_dst(&fl6, opt, &final); | 1294 | final_p = fl6_update_dst(&fl6, opt, &final); |
1295 | if (final_p) | 1295 | if (final_p) |
1296 | connected = 0; | 1296 | connected = false; |
1297 | 1297 | ||
1298 | if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) { | 1298 | if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) { |
1299 | fl6.flowi6_oif = np->mcast_oif; | 1299 | fl6.flowi6_oif = np->mcast_oif; |
1300 | connected = 0; | 1300 | connected = false; |
1301 | } else if (!fl6.flowi6_oif) | 1301 | } else if (!fl6.flowi6_oif) |
1302 | fl6.flowi6_oif = np->ucast_oif; | 1302 | fl6.flowi6_oif = np->ucast_oif; |
1303 | 1303 | ||