summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-01-07 21:40:34 +0000
committerjhb <jhb@FreeBSD.org>2011-01-07 21:40:34 +0000
commit24979b2fb3d3d45ce0620e015139c6a07637e709 (patch)
treeada60226ec88ac1eb9d5917a791528d92fb48d43 /sys
parentec8aab4b2d24a89a57c9fff5f45a3e8625735ee9 (diff)
downloadFreeBSD-src-24979b2fb3d3d45ce0620e015139c6a07637e709.zip
FreeBSD-src-24979b2fb3d3d45ce0620e015139c6a07637e709.tar.gz
Trim extra spaces before tabs.
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/tcp_input.c4
-rw-r--r--sys/netinet/tcp_lro.c2
-rw-r--r--sys/netinet/tcp_lro.h2
-rw-r--r--sys/netinet/tcp_reass.c2
-rw-r--r--sys/netinet/tcp_syncache.h2
-rw-r--r--sys/netinet/tcp_timer.c18
-rw-r--r--sys/netinet/tcp_usrreq.c2
-rw-r--r--sys/netinet/tcp_var.h6
-rw-r--r--sys/netinet/udp.h2
-rw-r--r--sys/netinet/udp_var.h2
10 files changed, 21 insertions, 21 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e2be41a..04183be 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -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 tcphdr *th, struct socket *so,
/*
* 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) +
diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c
index 18258a9..971473b 100644
--- a/sys/netinet/tcp_lro.c
+++ b/sys/netinet/tcp_lro.c
@@ -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);
}
}
diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h
index 08aac69..a5e8f9d 100644
--- a/sys/netinet/tcp_lro.h
+++ b/sys/netinet/tcp_lro.h
@@ -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;
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 442e3ca4..53ed4ff 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -266,7 +266,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int *tlenp, struct mbuf *m)
th->th_seq += i;
}
}
- tp->t_rcvoopack++;
+ tp->t_rcvoopack++;
TCPSTAT_INC(tcps_rcvoopack);
TCPSTAT_ADD(tcps_rcvoobyte, *tlenp);
diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
index 93c7aaa..ddfa459 100644
--- a/sys/netinet/tcp_syncache.h
+++ b/sys/netinet/tcp_syncache.h
@@ -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 */
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index c5838d3..6d0fa1c 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -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;
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index a2231ba..4a7ceff 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -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 */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index e7278ba..c9e935f 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -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 *);
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 6841683..2dbcaca 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -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. */
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index aa7ee47..7e7cfba 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -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);
OpenPOWER on IntegriCloud