diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-12-27 15:17:57 -0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 13:11:22 -0800 |
| commit | 8639a11e23d9eb0a6ceac2feed27acdfbb158f95 (patch) | |
| tree | 14895d8e71a0561b46da04421f55364a52e46b35 | |
| parent | 14c850212ed8f8cbb5972ad6b8812e08a0bc901c (diff) | |
| download | kernel_samsung_smdk4412-8639a11e23d9eb0a6ceac2feed27acdfbb158f95.zip kernel_samsung_smdk4412-8639a11e23d9eb0a6ceac2feed27acdfbb158f95.tar.gz kernel_samsung_smdk4412-8639a11e23d9eb0a6ceac2feed27acdfbb158f95.tar.bz2 | |
[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.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 176221c..3699304 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 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); |