From 6bd822eabf7d7e17c32ad0189a2c78dcd078df94 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 27 Dec 2005 15:17:57 -0200 Subject: [PATCH] --- yaml --- r: 15571 b: refs/heads/master c: 8639a11e23d9eb0a6ceac2feed27acdfbb158f95 h: refs/heads/master i: 15569: bba78395fba0cf75c0a804e964c45ce236864a26 15567: 82e2a28e0c931426a01d4d1f6ab12c49e064d17c v: v3 --- [refs] | 2 +- trunk/include/net/tcp.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 81beec748ec2..eeca99b7c591 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14c850212ed8f8cbb5972ad6b8812e08a0bc901c +refs/heads/master: 8639a11e23d9eb0a6ceac2feed27acdfbb158f95 diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index 176221cd0cce..369930497401 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -994,11 +994,11 @@ static __inline__ void tcp_build_and_update_options(__u32 *ptr, struct tcp_sock struct tcp_sack_block *sp = tp->rx_opt.dsack ? tp->duplicate_sack : tp->selective_acks; int this_sack; - *ptr++ = __constant_htonl((TCPOPT_NOP << 24) | - (TCPOPT_NOP << 16) | - (TCPOPT_SACK << 8) | - (TCPOLEN_SACK_BASE + - (tp->rx_opt.eff_sacks * TCPOLEN_SACK_PERBLOCK))); + *ptr++ = htonl((TCPOPT_NOP << 24) | + (TCPOPT_NOP << 16) | + (TCPOPT_SACK << 8) | + (TCPOLEN_SACK_BASE + (tp->rx_opt.eff_sacks * + TCPOLEN_SACK_PERBLOCK))); for(this_sack = 0; this_sack < tp->rx_opt.eff_sacks; this_sack++) { *ptr++ = htonl(sp[this_sack].start_seq); *ptr++ = htonl(sp[this_sack].end_seq);