aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-12-27 12:17:57 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-03 16:11:22 -0500
commit8639a11e23d9eb0a6ceac2feed27acdfbb158f95 (patch)
tree14895d8e71a0561b46da04421f55364a52e46b35
parent14c850212ed8f8cbb5972ad6b8812e08a0bc901c (diff)
[TCP]: Don't use __constant_htonl for a non const arg
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/tcp.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 176221cd0cce..369930497401 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -994,11 +994,11 @@ static __inline__ void tcp_build_and_update_options(__u32 *ptr, struct tcp_sock
994 struct tcp_sack_block *sp = tp->rx_opt.dsack ? tp->duplicate_sack : tp->selective_acks; 994 struct tcp_sack_block *sp = tp->rx_opt.dsack ? tp->duplicate_sack : tp->selective_acks;
995 int this_sack; 995 int this_sack;
996 996
997 *ptr++ = __constant_htonl((TCPOPT_NOP << 24) | 997 *ptr++ = htonl((TCPOPT_NOP << 24) |
998 (TCPOPT_NOP << 16) | 998 (TCPOPT_NOP << 16) |
999 (TCPOPT_SACK << 8) | 999 (TCPOPT_SACK << 8) |
1000 (TCPOLEN_SACK_BASE + 1000 (TCPOLEN_SACK_BASE + (tp->rx_opt.eff_sacks *
1001 (tp->rx_opt.eff_sacks * TCPOLEN_SACK_PERBLOCK))); 1001 TCPOLEN_SACK_PERBLOCK)));
1002 for(this_sack = 0; this_sack < tp->rx_opt.eff_sacks; this_sack++) { 1002 for(this_sack = 0; this_sack < tp->rx_opt.eff_sacks; this_sack++) {
1003 *ptr++ = htonl(sp[this_sack].start_seq); 1003 *ptr++ = htonl(sp[this_sack].start_seq);
1004 *ptr++ = htonl(sp[this_sack].end_seq); 1004 *ptr++ = htonl(sp[this_sack].end_seq);