diff -NurpP --minimal linux-2.4.21-vs1.20/Makefile linux-2.4.21-vs1.21/Makefile
--- linux-2.4.21-vs1.20/Makefile	Thu Dec  4 19:58:54 2003
+++ linux-2.4.21-vs1.21/Makefile	Thu Dec 11 02:45:36 2003
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -vs1.20
+EXTRAVERSION = -vs1.21
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -NurpP --minimal linux-2.4.21-vs1.20/net/ipv4/tcp_ipv4.c linux-2.4.21-vs1.21/net/ipv4/tcp_ipv4.c
--- linux-2.4.21-vs1.20/net/ipv4/tcp_ipv4.c	Thu Dec  4 19:58:55 2003
+++ linux-2.4.21-vs1.21/net/ipv4/tcp_ipv4.c	Thu Dec 11 00:38:51 2003
@@ -206,11 +206,9 @@ static inline int tcp_in_list (struct so
 */
 int tcp_ipv4_addr_conflict (struct sock *sk1, struct sock *sk2)
 {
-	int ret = 0;
-
 	if (sk1->rcv_saddr) {
 		/* Bind to one address only */
-		ret = tcp_in_list (sk2,sk1->rcv_saddr);
+		return tcp_in_list (sk2,sk1->rcv_saddr);
 	} else if (sk1->ip_info) {
 		/* A restricted bind(any) */
 		struct iproot_info *ip_info = sk1->ip_info;