diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 23:24:49 +0900 | 
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-10 23:19:42 -0800 | 
| commit | 1ab1457c42bc078e5a9becd82a7f9f940b55c53a (patch) | |
| tree | c25d27c58fb27f4c5930ad120995cc2e3f1e7a4f /net/ipv6/datagram.c | |
| parent | e905a9edab7f4f14f9213b52234e4a346c690911 (diff) | |
| download | olio-linux-3.10-1ab1457c42bc078e5a9becd82a7f9f940b55c53a.tar.xz olio-linux-3.10-1ab1457c42bc078e5a9becd82a7f9f940b55c53a.zip  | |
[NET] IPV6: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/datagram.c')
| -rw-r--r-- | net/ipv6/datagram.c | 52 | 
1 files changed, 26 insertions, 26 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index ecde30140f4..5f54dec3e20 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -1,9 +1,9 @@  /*   *	common UDP/RAW code - *	Linux INET6 implementation  + *	Linux INET6 implementation   *   *	Authors: - *	Pedro Roque		<roque@di.fc.ul.pt>	 + *	Pedro Roque		<roque@di.fc.ul.pt>   *   *	$Id: datagram.c,v 1.24 2002/02/01 22:01:04 davem Exp $   * @@ -55,10 +55,10 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)  	}  	if (addr_len < SIN6_LEN_RFC2133) -	  	return -EINVAL; +		return -EINVAL; -	if (usin->sin6_family != AF_INET6)  -	  	return -EAFNOSUPPORT; +	if (usin->sin6_family != AF_INET6) +		return -EAFNOSUPPORT;  	memset(&fl, 0, sizeof(fl));  	if (np->sndflow) { @@ -93,14 +93,14 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)  		sin.sin_addr.s_addr = daddr->s6_addr32[3];  		sin.sin_port = usin->sin6_port; -		err = ip4_datagram_connect(sk,  -					   (struct sockaddr*) &sin,  +		err = ip4_datagram_connect(sk, +					   (struct sockaddr*) &sin,  					   sizeof(sin));  ipv4_connected:  		if (err)  			goto out; -		 +  		ipv6_addr_set(&np->daddr, 0, 0, htonl(0x0000ffff), inet->daddr);  		if (ipv6_addr_any(&np->saddr)) { @@ -206,7 +206,7 @@ out:  	return err;  } -void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,  +void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,  		     __be16 port, u32 info, u8 *payload)  {  	struct ipv6_pinfo *np  = inet6_sk(sk); @@ -223,7 +223,7 @@ void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,  	serr = SKB_EXT_ERR(skb);  	serr->ee.ee_errno = err;  	serr->ee.ee_origin = SO_EE_ORIGIN_ICMP6; -	serr->ee.ee_type = icmph->icmp6_type;  +	serr->ee.ee_type = icmph->icmp6_type;  	serr->ee.ee_code = icmph->icmp6_code;  	serr->ee.ee_pad = 0;  	serr->ee.ee_info = info; @@ -259,7 +259,7 @@ void ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info)  	serr = SKB_EXT_ERR(skb);  	serr->ee.ee_errno = err;  	serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL; -	serr->ee.ee_type = 0;  +	serr->ee.ee_type = 0;  	serr->ee.ee_code = 0;  	serr->ee.ee_pad = 0;  	serr->ee.ee_info = info; @@ -274,7 +274,7 @@ void ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info)  		kfree_skb(skb);  } -/*  +/*   *	Handle MSG_ERRQUEUE   */  int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len) @@ -312,7 +312,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)  	if (sin) {  		sin->sin6_family = AF_INET6;  		sin->sin6_flowinfo = 0; -		sin->sin6_port = serr->port;  +		sin->sin6_port = serr->port;  		sin->sin6_scope_id = 0;  		if (serr->ee.ee_origin == SO_EE_ORIGIN_ICMP6) {  			ipv6_addr_copy(&sin->sin6_addr, @@ -370,7 +370,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)  		spin_unlock_bh(&sk->sk_error_queue.lock);  	} -out_free_skb:	 +out_free_skb:  	kfree_skb(skb);  out:  	return err; @@ -419,7 +419,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)  		 * report extension headers (except for HbH)  		 * in order.  		 * -		 * Also note that IPV6_RECVRTHDRDSTOPTS is NOT  +		 * Also note that IPV6_RECVRTHDRDSTOPTS is NOT  		 * (and WILL NOT be) defined because  		 * IPV6_RECVDSTOPTS is more generic. --yoshfuji  		 */ @@ -512,15 +512,15 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  			continue;  		switch (cmsg->cmsg_type) { - 		case IPV6_PKTINFO: - 		case IPV6_2292PKTINFO: - 			if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct in6_pktinfo))) { +		case IPV6_PKTINFO: +		case IPV6_2292PKTINFO: +			if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct in6_pktinfo))) {  				err = -EINVAL;  				goto exit_f;  			}  			src_info = (struct in6_pktinfo *)CMSG_DATA(cmsg); -			 +  			if (src_info->ipi6_ifindex) {  				if (fl->oif && src_info->ipi6_ifindex != fl->oif)  					return -EINVAL; @@ -531,7 +531,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  			if (addr_type == IPV6_ADDR_ANY)  				break; -			 +  			if (addr_type & IPV6_ADDR_LINKLOCAL) {  				if (!src_info->ipi6_ifindex)  					return -EINVAL; @@ -554,7 +554,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  			break;  		case IPV6_FLOWINFO: -                        if (cmsg->cmsg_len < CMSG_LEN(4)) { +			if (cmsg->cmsg_len < CMSG_LEN(4)) {  				err = -EINVAL;  				goto exit_f;  			} @@ -570,7 +570,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  		case IPV6_2292HOPOPTS:  		case IPV6_HOPOPTS: -                        if (opt->hopopt || cmsg->cmsg_len < CMSG_LEN(sizeof(struct ipv6_opt_hdr))) { +			if (opt->hopopt || cmsg->cmsg_len < CMSG_LEN(sizeof(struct ipv6_opt_hdr))) {  				err = -EINVAL;  				goto exit_f;  			} @@ -590,7 +590,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  			break;  		case IPV6_2292DSTOPTS: -                        if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct ipv6_opt_hdr))) { +			if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct ipv6_opt_hdr))) {  				err = -EINVAL;  				goto exit_f;  			} @@ -641,7 +641,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  		case IPV6_2292RTHDR:  		case IPV6_RTHDR: -                        if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct ipv6_rt_hdr))) { +			if (cmsg->cmsg_len < CMSG_LEN(sizeof(struct ipv6_rt_hdr))) {  				err = -EINVAL;  				goto exit_f;  			} @@ -661,7 +661,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  			len = ((rthdr->hdrlen + 1) << 3); -                        if (cmsg->cmsg_len < CMSG_LEN(len)) { +			if (cmsg->cmsg_len < CMSG_LEN(len)) {  				err = -EINVAL;  				goto exit_f;  			} @@ -716,7 +716,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,  		    }  		default:  			LIMIT_NETDEBUG(KERN_DEBUG "invalid cmsg type: %d\n", -			               cmsg->cmsg_type); +				       cmsg->cmsg_type);  			err = -EINVAL;  			break;  		};  |