Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 7 Jan 2011 21:40:35 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r217126 - head/sys/netinet
Message-ID:  <201101072140.p07LeZBZ066573@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhb
Date: Fri Jan  7 21:40:34 2011
New Revision: 217126
URL: http://svn.freebsd.org/changeset/base/217126

Log:
  Trim extra spaces before tabs.

Modified:
  head/sys/netinet/tcp_input.c
  head/sys/netinet/tcp_lro.c
  head/sys/netinet/tcp_lro.h
  head/sys/netinet/tcp_reass.c
  head/sys/netinet/tcp_syncache.h
  head/sys/netinet/tcp_timer.c
  head/sys/netinet/tcp_usrreq.c
  head/sys/netinet/tcp_var.h
  head/sys/netinet/udp.h
  head/sys/netinet/udp_var.h

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_input.c	Fri Jan  7 21:40:34 2011	(r217126)
@@ -1086,7 +1086,7 @@ relocked:
 				    "SYN|FIN segment ignored (based on "
 				    "sysctl setting)\n", s, __func__);
 			TCPSTAT_INC(tcps_badsyn);
-                	goto dropunlock;
+			goto dropunlock;
 		}
 		/*
 		 * Segment's flags are (SYN) or (SYN|FIN).
@@ -2271,7 +2271,7 @@ tcp_do_segment(struct mbuf *m, struct tc
 						/*
 						 * Compute the amount of data in flight first.
 						 * We can inject new data into the pipe iff 
-						 * we have less than 1/2 the original window's 	
+						 * we have less than 1/2 the original window's
 						 * worth of data in flight.
 						 */
 						awnd = (tp->snd_nxt - tp->snd_fack) +

Modified: head/sys/netinet/tcp_lro.c
==============================================================================
--- head/sys/netinet/tcp_lro.c	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_lro.c	Fri Jan  7 21:40:34 2011	(r217126)
@@ -108,7 +108,7 @@ tcp_lro_free(struct lro_ctrl *cntl)
 
 	while (!SLIST_EMPTY(&cntl->lro_free)) {
 		entry = SLIST_FIRST(&cntl->lro_free);
-               	SLIST_REMOVE_HEAD(&cntl->lro_free, next);
+		SLIST_REMOVE_HEAD(&cntl->lro_free, next);
 		free(entry, M_DEVBUF);
 	}
 }

Modified: head/sys/netinet/tcp_lro.h
==============================================================================
--- head/sys/netinet/tcp_lro.h	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_lro.h	Fri Jan  7 21:40:34 2011	(r217126)
@@ -41,7 +41,7 @@ struct lro_entry;
 struct lro_entry
 {
 	SLIST_ENTRY(lro_entry) next;
-	struct mbuf  	*m_head;
+	struct mbuf	*m_head;
 	struct mbuf	*m_tail;
 	int		timestamp;
 	struct ip	*ip;

Modified: head/sys/netinet/tcp_reass.c
==============================================================================
--- head/sys/netinet/tcp_reass.c	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_reass.c	Fri Jan  7 21:40:34 2011	(r217126)
@@ -266,7 +266,7 @@ tcp_reass(struct tcpcb *tp, struct tcphd
 			th->th_seq += i;
 		}
 	}
- 	tp->t_rcvoopack++;
+	tp->t_rcvoopack++;
 	TCPSTAT_INC(tcps_rcvoopack);
 	TCPSTAT_ADD(tcps_rcvoobyte, *tlenp);
 

Modified: head/sys/netinet/tcp_syncache.h
==============================================================================
--- head/sys/netinet/tcp_syncache.h	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_syncache.h	Fri Jan  7 21:40:34 2011	(r217126)
@@ -77,7 +77,7 @@ struct syncache {
 	u_int16_t	sc_flags;
 #ifndef TCP_OFFLOAD_DISABLE
 	struct toe_usrreqs *sc_tu;		/* TOE operations */
-	void 		*sc_toepcb;		/* TOE protocol block */
+	void		*sc_toepcb;		/* TOE protocol block */
 #endif			
 	struct label	*sc_label;		/* MAC label reference */
 	struct ucred	*sc_cred;		/* cred cache for jail checks */

Modified: head/sys/netinet/tcp_timer.c
==============================================================================
--- head/sys/netinet/tcp_timer.c	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_timer.c	Fri Jan  7 21:40:34 2011	(r217126)
@@ -486,15 +486,15 @@ tcp_timer_rexmt(void * xtp)
 		tp->t_rxtshift = TCP_MAXRXTSHIFT;
 		TCPSTAT_INC(tcps_timeoutdrop);
 		in_pcbref(inp);
- 		INP_INFO_RUNLOCK(&V_tcbinfo);
- 		INP_WUNLOCK(inp);
- 		INP_INFO_WLOCK(&V_tcbinfo);
- 		INP_WLOCK(inp);
- 		if (in_pcbrele(inp)) {
- 			INP_INFO_WUNLOCK(&V_tcbinfo);
- 			CURVNET_RESTORE();
- 			return;
- 		}
+		INP_INFO_RUNLOCK(&V_tcbinfo);
+		INP_WUNLOCK(inp);
+		INP_INFO_WLOCK(&V_tcbinfo);
+		INP_WLOCK(inp);
+		if (in_pcbrele(inp)) {
+			INP_INFO_WUNLOCK(&V_tcbinfo);
+			CURVNET_RESTORE();
+			return;
+		}
 		tp = tcp_drop(tp, tp->t_softerror ?
 			      tp->t_softerror : ETIMEDOUT);
 		headlocked = 1;

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_usrreq.c	Fri Jan  7 21:40:34 2011	(r217126)
@@ -1042,7 +1042,7 @@ struct pr_usrreqs tcp6_usrreqs = {
 	.pru_send =		tcp_usr_send,
 	.pru_shutdown =		tcp_usr_shutdown,
 	.pru_sockaddr =		in6_mapped_sockaddr,
- 	.pru_sosetlabel =	in_pcbsosetlabel,
+	.pru_sosetlabel =	in_pcbsosetlabel,
 	.pru_close =		tcp_usr_close,
 };
 #endif /* INET6 */

Modified: head/sys/netinet/tcp_var.h
==============================================================================
--- head/sys/netinet/tcp_var.h	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/tcp_var.h	Fri Jan  7 21:40:34 2011	(r217126)
@@ -476,7 +476,7 @@ struct	tcpstat {
 	u_long  tcps_sack_rexmit_bytes;	    /* SACK rexmit bytes      */
 	u_long  tcps_sack_rcv_blocks;	    /* SACK blocks (options) received */
 	u_long  tcps_sack_send_blocks;	    /* SACK blocks (options) sent     */
-	u_long  tcps_sack_sboverflow; 	    /* times scoreboard overflowed */
+	u_long  tcps_sack_sboverflow;	    /* times scoreboard overflowed */
 	
 	/* ECN related stats */
 	u_long	tcps_ecn_ce;		/* ECN Congestion Experienced */
@@ -532,7 +532,7 @@ struct xtcp_timer {
 	int tt_keep;	/* keepalive */
 	int tt_2msl;	/* 2*msl TIME_WAIT timer */
 	int tt_delack;	/* delayed ACK timer */
-	int t_rcvtime; 	/* Time since last packet received */
+	int t_rcvtime;	/* Time since last packet received */
 };
 struct	xtcpcb {
 	size_t	xt_len;
@@ -648,7 +648,7 @@ void	 tcp_init(void);
 void	 tcp_destroy(void);
 #endif
 void	 tcp_fini(void *);
-char 	*tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *,
+char	*tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *,
 	    const void *);
 char	*tcp_log_vain(struct in_conninfo *, struct tcphdr *, void *,
 	    const void *);

Modified: head/sys/netinet/udp.h
==============================================================================
--- head/sys/netinet/udp.h	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/udp.h	Fri Jan  7 21:40:34 2011	(r217126)
@@ -55,7 +55,7 @@ struct udphdr {
  * UDP Encapsulation of IPsec Packets options.
  */
 /* Encapsulation types. */
-#define	UDP_ENCAP_ESPINUDP_NON_IKE 	1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
+#define	UDP_ENCAP_ESPINUDP_NON_IKE	1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
 #define	UDP_ENCAP_ESPINUDP		2 /* draft-ietf-ipsec-udp-encaps-02+ */
 
 /* Default ESP in UDP encapsulation port. */

Modified: head/sys/netinet/udp_var.h
==============================================================================
--- head/sys/netinet/udp_var.h	Fri Jan  7 20:36:27 2011	(r217125)
+++ head/sys/netinet/udp_var.h	Fri Jan  7 21:40:34 2011	(r217126)
@@ -146,7 +146,7 @@ int		 udp_newudpcb(struct inpcb *);
 void		 udp_discardcb(struct udpcb *);
 
 void		 udp_ctlinput(int, struct sockaddr *, void *);
-int	 	 udp_ctloutput(struct socket *, struct sockopt *);
+int		 udp_ctloutput(struct socket *, struct sockopt *);
 void		 udp_init(void);
 #ifdef VIMAGE
 void		 udp_destroy(void);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101072140.p07LeZBZ066573>