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/inet6_hashtables.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/inet6_hashtables.c')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 98 | 
1 files changed, 49 insertions, 49 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index e61116949be..30b16da739c 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -115,7 +115,7 @@ struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,  	sk_for_each(sk, node, &hashinfo->listening_hash[inet_lhashfn(hnum)]) {  		if (inet_sk(sk)->num == hnum && sk->sk_family == PF_INET6) {  			const struct ipv6_pinfo *np = inet6_sk(sk); -			 +  			score = 1;  			if (!ipv6_addr_any(&np->rcv_saddr)) {  				if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) @@ -249,81 +249,81 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row,  {  	struct inet_hashinfo *hinfo = death_row->hashinfo;  	const unsigned short snum = inet_sk(sk)->num; - 	struct inet_bind_hashbucket *head; - 	struct inet_bind_bucket *tb; +	struct inet_bind_hashbucket *head; +	struct inet_bind_bucket *tb;  	int ret; - 	if (snum == 0) { - 		const int low = sysctl_local_port_range[0]; - 		const int high = sysctl_local_port_range[1]; +	if (snum == 0) { +		const int low = sysctl_local_port_range[0]; +		const int high = sysctl_local_port_range[1];  		const int range = high - low; - 		int i, port; +		int i, port;  		static u32 hint;  		const u32 offset = hint + inet6_sk_port_offset(sk);  		struct hlist_node *node; - 		struct inet_timewait_sock *tw = NULL; +		struct inet_timewait_sock *tw = NULL; - 		local_bh_disable(); +		local_bh_disable();  		for (i = 1; i <= range; i++) {  			port = low + (i + offset) % range; - 			head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)]; - 			spin_lock(&head->lock); +			head = &hinfo->bhash[inet_bhashfn(port, hinfo->bhash_size)]; +			spin_lock(&head->lock); - 			/* Does not bother with rcv_saddr checks, - 			 * because the established check is already - 			 * unique enough. - 			 */ +			/* Does not bother with rcv_saddr checks, +			 * because the established check is already +			 * unique enough. +			 */  			inet_bind_bucket_for_each(tb, node, &head->chain) { - 				if (tb->port == port) { - 					BUG_TRAP(!hlist_empty(&tb->owners)); - 					if (tb->fastreuse >= 0) - 						goto next_port; - 					if (!__inet6_check_established(death_row, +				if (tb->port == port) { +					BUG_TRAP(!hlist_empty(&tb->owners)); +					if (tb->fastreuse >= 0) +						goto next_port; +					if (!__inet6_check_established(death_row,  								       sk, port,  								       &tw)) - 						goto ok; - 					goto next_port; - 				} - 			} +						goto ok; +					goto next_port; +				} +			} - 			tb = inet_bind_bucket_create(hinfo->bind_bucket_cachep, +			tb = inet_bind_bucket_create(hinfo->bind_bucket_cachep,  						     head, port); - 			if (!tb) { - 				spin_unlock(&head->lock); - 				break; - 			} - 			tb->fastreuse = -1; - 			goto ok; +			if (!tb) { +				spin_unlock(&head->lock); +				break; +			} +			tb->fastreuse = -1; +			goto ok; - 		next_port: - 			spin_unlock(&head->lock); - 		} - 		local_bh_enable(); +		next_port: +			spin_unlock(&head->lock); +		} +		local_bh_enable(); - 		return -EADDRNOTAVAIL; +		return -EADDRNOTAVAIL;  ok:  		hint += i; - 		/* Head lock still held and bh's disabled */ - 		inet_bind_hash(sk, tb, port); +		/* Head lock still held and bh's disabled */ +		inet_bind_hash(sk, tb, port);  		if (sk_unhashed(sk)) { - 			inet_sk(sk)->sport = htons(port); - 			__inet6_hash(hinfo, sk); - 		} - 		spin_unlock(&head->lock); +			inet_sk(sk)->sport = htons(port); +			__inet6_hash(hinfo, sk); +		} +		spin_unlock(&head->lock); - 		if (tw) { - 			inet_twsk_deschedule(tw, death_row); - 			inet_twsk_put(tw); - 		} +		if (tw) { +			inet_twsk_deschedule(tw, death_row); +			inet_twsk_put(tw); +		}  		ret = 0;  		goto out; - 	} +	} - 	head = &hinfo->bhash[inet_bhashfn(snum, hinfo->bhash_size)]; - 	tb   = inet_csk(sk)->icsk_bind_hash; +	head = &hinfo->bhash[inet_bhashfn(snum, hinfo->bhash_size)]; +	tb   = inet_csk(sk)->icsk_bind_hash;  	spin_lock_bh(&head->lock);  	if (sk_head(&tb->owners) == sk && sk->sk_bind_node.next == NULL) {  |