diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-01-11 15:05:33 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-01-11 15:05:33 +0000 |
| commit | 5b35ff8362e79c359fb9b429eeea2e7bd67839f7 (patch) | |
| tree | 761821d4be00879af0c6d78bf27e269b25891148 /sys/netinet | |
| parent | 8e9dc0002dac34577eede687f50646cdad38b58a (diff) | |
Make TCP_SACK compile with new netinet
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_input.c | 12 | ||||
| -rw-r--r-- | sys/netinet/tcp_var.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 2b368b72ebd..8787479426a 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.24 1999/01/11 02:01:35 deraadt Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.25 1999/01/11 15:05:32 niklas Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -2514,7 +2514,7 @@ tcp_sack_option(tp, th, cp, optlen) void tcp_del_sackholes(tp, th) struct tcpcb *tp; - struct tcpiphdr *th; + struct tcphdr *th; { if (!tp->sack_disable && tp->t_state != TCPS_LISTEN) { /* max because this could be an older ack just arrived */ @@ -2559,9 +2559,9 @@ tcp_clean_sackreport(tp) int tcp_sack_partialack(tp, th) struct tcpcb *tp; - struct tcpiphdr *th; + struct tcphdr *th; { - if (SEQ_LT(th->ti_ack, tp->snd_last)) { + if (SEQ_LT(th->th_ack, tp->snd_last)) { /* Turn off retx. timer (will start again next segment) */ tp->t_timer[TCPT_REXMT] = 0; tp->t_rtt = 0; @@ -2908,8 +2908,8 @@ tcp_mss(tp, offer) */ int tcp_newreno(tp, th) -struct tcpcb *tp; -struct tcphdr *th; + struct tcpcb *tp; + struct tcphdr *th; { if (SEQ_LT(th->th_ack, tp->snd_last)) { tcp_seq onxt = tp->snd_nxt; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 9d136abf83f..4cfcd03138b 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.15 1999/01/11 02:01:36 deraadt Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.16 1999/01/11 15:05:32 niklas Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -357,19 +357,19 @@ int tcp_usrreq __P((struct socket *, void tcp_xmit_timer __P((struct tcpcb *, int)); void tcpdropoldhalfopen __P((struct tcpcb *, u_int16_t)); #ifdef TCP_SACK -int tcp_sack_option __P((struct tcpcb *,struct tcpiphdr *,u_char *,int)); +int tcp_sack_option __P((struct tcpcb *,struct tcphdr *,u_char *,int)); void tcp_update_sack_list __P((struct tcpcb *tp)); -void tcp_del_sackholes __P((struct tcpcb *, struct tcpiphdr *)); +void tcp_del_sackholes __P((struct tcpcb *, struct tcphdr *)); void tcp_clean_sackreport __P((struct tcpcb *tp)); void tcp_sack_adjust __P((struct tcpcb *tp)); struct sackhole * tcp_sack_output __P((struct tcpcb *tp)); -int tcp_sack_partialack __P((struct tcpcb *, struct tcpiphdr *)); +int tcp_sack_partialack __P((struct tcpcb *, struct tcphdr *)); #ifdef DEBUG void tcp_print_holes __P((struct tcpcb *tp)); #endif #endif /* TCP_SACK */ #if defined(TCP_NEWRENO) || defined(TCP_SACK) -int tcp_newreno __P((struct tcpcb *, struct tcpiphdr *)); +int tcp_newreno __P((struct tcpcb *, struct tcphdr *)); u_long tcp_seq_subtract __P((u_long, u_long )); #endif /* TCP_NEWRENO || TCP_SACK */ |