Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8639a11e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[TCP]: Don't use __constant_htonl for a non const arg 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14c85021

include/net/tcp.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -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;

		struct tcp_sack_block *sp = tp->rx_opt.dsack ? tp->duplicate_sack : tp->selective_acks;

		int this_sack;

		int this_sack;





		*ptr++ = __constant_htonl((TCPOPT_NOP << 24) |

		*ptr++ = htonl((TCPOPT_NOP  << 24) |

			       (TCPOPT_NOP  << 16) |

			       (TCPOPT_NOP  << 16) |

			       (TCPOPT_SACK <<  8) |

			       (TCPOPT_SACK <<  8) |

					  (TCPOLEN_SACK_BASE +

			       (TCPOLEN_SACK_BASE + (tp->rx_opt.eff_sacks *

					   (tp->rx_opt.eff_sacks * TCPOLEN_SACK_PERBLOCK)));

						     TCPOLEN_SACK_PERBLOCK)));

		for(this_sack = 0; this_sack < tp->rx_opt.eff_sacks; this_sack++) {

		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].start_seq);

			*ptr++ = htonl(sp[this_sack].end_seq);

			*ptr++ = htonl(sp[this_sack].end_seq);