diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /pfinet/linux-src/net/ipv4/tcp_input.c | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
| download | hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.gz hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.tar.bz2 hurd-13ea39a34766fcbecd96ab94bcdf798b08e9bb60.zip | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'pfinet/linux-src/net/ipv4/tcp_input.c')
| -rw-r--r-- | pfinet/linux-src/net/ipv4/tcp_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pfinet/linux-src/net/ipv4/tcp_input.c b/pfinet/linux-src/net/ipv4/tcp_input.c index 7f5cc4e7..e84eaf43 100644 --- a/pfinet/linux-src/net/ipv4/tcp_input.c +++ b/pfinet/linux-src/net/ipv4/tcp_input.c @@ -130,7 +130,7 @@ static __inline__ void tcp_remember_ack(struct tcp_opt *tp, struct tcphdr *th, { tp->delayed_acks++; - /* Tiny-grams with PSH set artifically deflate our + /* Tiny-grams with PSH set artificially deflate our * ato measurement, but with a lower bound. */ if(th->psh && (skb->len < (tp->mss_cache >> 1))) { @@ -989,7 +989,7 @@ tcp_timewait_state_process(struct tcp_tw_bucket *tw, struct sk_buff *skb, /* Check RST or SYN */ if(th->rst || th->syn) { - /* This is TIME_WAIT assasination, in two flavors. + /* This is TIME_WAIT assassination, in two flavors. * Oh well... nobody has a sufficient solution to this * protocol bug yet. */ @@ -1931,7 +1931,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, * Dave!!! Phrase above (and all about rcv_mss) has * nothing to do with reality. rcv_mss must measure TOTAL * size, including sacks, IP options etc. Hence, measure_rcv_mss - * must occure before pulling etc, otherwise it will flap + * must occur before pulling etc, otherwise it will flap * like hell. Even putting it before tcp_data is wrong, * it should use skb->tail - skb->nh.raw instead. * --ANK (980805) @@ -1939,7 +1939,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, * BTW I broke it. Now all TCP options are handled equally * in mss_clamp calculations (i.e. ignored, rfc1122), * and mss_cache does include all of them (i.e. tstamps) - * except for sacks, to calulate effective mss faster. + * except for sacks, to calculate effective mss faster. * --ANK (980805) */ tcp_measure_rcv_mss(sk, skb); |