Mon Apr 25 22:12:43 2011 UTC ()

tcp_input: simplify redundant assignment.  no functional changes.


(yamt)

diff -r1.310 -r1.311 src/sys/netinet/tcp_input.c

--- src/sys/netinet/tcp_input.c 2011/04/20 14:08:07	1.310
+++ src/sys/netinet/tcp_input.c 2011/04/25 22:12:43	1.311

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcp_input.c,v 1.310 2011/04/20 14:08:07 wiz Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.311 2011/04/25 22:12:43 yamt Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -135,27 +135,27 @@
  */
 /*
  *	TODO list for SYN cache stuff:
+ *
  *	Find room for a "state" field, which is needed to keep a
  *	compressed state for TIME_WAIT TCBs.  It's been noted already
  *	that this is fairly important for very high-volume web and
  *	mail servers, which use a large number of short-lived
  *	connections.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.310 2011/04/20 14:08:07 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.311 2011/04/25 22:12:43 yamt Exp $");
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
 #include "opt_tcp_debug.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -996,27 +996,28 @@ tcp_input(struct mbuf *m, ...)
 	struct tcphdr *th;
 	struct ip *ip;
 	struct inpcb *inp;
 #ifdef INET6
 	struct ip6_hdr *ip6;
 	struct in6pcb *in6p;
 #endif
 	u_int8_t *optp = NULL;
 	int optlen = 0;
 	int len, tlen, toff, hdroptlen = 0;
 	struct tcpcb *tp = 0;
 	int tiflags;
 	struct socket *so = NULL;
-	int todrop, dupseg, acked, ourfinisacked, needoutput = 0;
+	int todrop, acked, ourfinisacked, needoutput = 0;
 	bool dupseg;
 #ifdef TCP_DEBUG
 	short ostate = 0;
 #endif
 	u_long tiwin;
 	struct tcp_opt_info opti;
 	int off, iphlen;
 	va_list ap;
 	int af;		/* af on the wire */
 	struct mbuf *tcp_saveti = NULL;
 	uint32_t ts_rtt;
 	uint8_t iptos;
 	uint64_t *tcps;
 @@ -1047,35 +1048,34 @@ tcp_input(struct mbuf *m, ...)
+	}
 #ifdef INET6
 	if (m->m_flags & M_ANYCAST6) {
 		/* XXX stat */
 		goto drop;
+	}
 #endif
 	/*
 	 * Get IP and TCP header.
 	 * Note: IP leaves IP header in first mbuf.
 	 */
 	ip = mtod(m, struct ip *);
 #ifdef INET6
 	ip6 = NULL;
 #endif
 	switch (ip->ip_v) {
 #ifdef INET
 	case 4:
 #ifdef INET6
 		ip6 = NULL;
 #endif
 		af = AF_INET;
 		iphlen = sizeof(struct ip);
 		ip = mtod(m, struct ip *);
 		IP6_EXTHDR_GET(th, struct tcphdr *, m, toff,
 			sizeof(struct tcphdr));
 		if (th == NULL) {
 			TCP_STATINC(TCP_STAT_RCVSHORT);
 			return;
+		}
 		/* We do the checksum after PCB lookup... */
 		len = ntohs(ip->ip_len);
 		tlen = len - toff;
 		iptos = ip->ip_tos;
 		break;
 #endif
 #ifdef INET6