diff options
| author | Alexey Kodanev <alexey.kodanev@oracle.com> | 2018-04-03 15:00:09 +0300 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-04 11:31:57 -0400 | 
| commit | 9f542f616c24f7d85a4bde42ec621e8d87478fd8 (patch) | |
| tree | 7aa25ad97709e84390dc6ecb94d5954b8b47b788 /net/ipv6/udp.c | |
| 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>
Diffstat (limited to 'net/ipv6/udp.c')
| -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)  	struct dst_entry *dst;  	struct ipcm6_cookie ipc6;  	int addr_len = msg->msg_namelen; +	bool connected = false;  	int ulen = len;  	int corkreq = up->corkflag || msg->msg_flags&MSG_MORE;  	int err; -	int connected = 0;  	int is_udplite = IS_UDPLITE(sk);  	int (*getfrag)(void *, char *, int, int, int, struct sk_buff *);  	struct sockcm_cookie sockc; @@ -1241,7 +1241,7 @@ do_udp_sendmsg:  		fl6.fl6_dport = inet->inet_dport;  		daddr = &sk->sk_v6_daddr;  		fl6.flowlabel = np->flow_label; -		connected = 1; +		connected = true;  	}  	if (!fl6.flowi6_oif) @@ -1271,7 +1271,7 @@ do_udp_sendmsg:  		}  		if (!(opt->opt_nflen|opt->opt_flen))  			opt = NULL; -		connected = 0; +		connected = false;  	}  	if (!opt) {  		opt = txopt_get(np); @@ -1293,11 +1293,11 @@ do_udp_sendmsg:  	final_p = fl6_update_dst(&fl6, opt, &final);  	if (final_p) -		connected = 0; +		connected = false;  	if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) {  		fl6.flowi6_oif = np->mcast_oif; -		connected = 0; +		connected = false;  	} else if (!fl6.flowi6_oif)  		fl6.flowi6_oif = np->ucast_oif;  | 
