aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 061edfae0c29..9a253faefc81 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -269,7 +269,7 @@ static u16 tcp_select_window(struct sock *sk)
269 return new_win; 269 return new_win;
270} 270}
271 271
272static void tcp_build_and_update_options(__u32 *ptr, struct tcp_sock *tp, 272static void tcp_build_and_update_options(__be32 *ptr, struct tcp_sock *tp,
273 __u32 tstamp) 273 __u32 tstamp)
274{ 274{
275 if (tp->rx_opt.tstamp_ok) { 275 if (tp->rx_opt.tstamp_ok) {
@@ -305,7 +305,7 @@ static void tcp_build_and_update_options(__u32 *ptr, struct tcp_sock *tp,
305 * MAX_SYN_SIZE to match the new maximum number of options that you 305 * MAX_SYN_SIZE to match the new maximum number of options that you
306 * can generate. 306 * can generate.
307 */ 307 */
308static void tcp_syn_build_options(__u32 *ptr, int mss, int ts, int sack, 308static void tcp_syn_build_options(__be32 *ptr, int mss, int ts, int sack,
309 int offer_wscale, int wscale, __u32 tstamp, 309 int offer_wscale, int wscale, __u32 tstamp,
310 __u32 ts_recent) 310 __u32 ts_recent)
311{ 311{
@@ -424,7 +424,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
424 th->dest = inet->dport; 424 th->dest = inet->dport;
425 th->seq = htonl(tcb->seq); 425 th->seq = htonl(tcb->seq);
426 th->ack_seq = htonl(tp->rcv_nxt); 426 th->ack_seq = htonl(tp->rcv_nxt);
427 *(((__u16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | 427 *(((__be16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) |
428 tcb->flags); 428 tcb->flags);
429 429
430 if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) { 430 if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
@@ -445,7 +445,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
445 } 445 }
446 446
447 if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) { 447 if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) {
448 tcp_syn_build_options((__u32 *)(th + 1), 448 tcp_syn_build_options((__be32 *)(th + 1),
449 tcp_advertise_mss(sk), 449 tcp_advertise_mss(sk),
450 (sysctl_flags & SYSCTL_FLAG_TSTAMPS), 450 (sysctl_flags & SYSCTL_FLAG_TSTAMPS),
451 (sysctl_flags & SYSCTL_FLAG_SACK), 451 (sysctl_flags & SYSCTL_FLAG_SACK),
@@ -454,7 +454,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
454 tcb->when, 454 tcb->when,
455 tp->rx_opt.ts_recent); 455 tp->rx_opt.ts_recent);
456 } else { 456 } else {
457 tcp_build_and_update_options((__u32 *)(th + 1), 457 tcp_build_and_update_options((__be32 *)(th + 1),
458 tp, tcb->when); 458 tp, tcb->when);
459 TCP_ECN_send(sk, tp, skb, tcp_header_size); 459 TCP_ECN_send(sk, tp, skb, tcp_header_size);
460 } 460 }
@@ -2070,7 +2070,7 @@ struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
2070 th->window = htons(req->rcv_wnd); 2070 th->window = htons(req->rcv_wnd);
2071 2071
2072 TCP_SKB_CB(skb)->when = tcp_time_stamp; 2072 TCP_SKB_CB(skb)->when = tcp_time_stamp;
2073 tcp_syn_build_options((__u32 *)(th + 1), dst_metric(dst, RTAX_ADVMSS), ireq->tstamp_ok, 2073 tcp_syn_build_options((__be32 *)(th + 1), dst_metric(dst, RTAX_ADVMSS), ireq->tstamp_ok,
2074 ireq->sack_ok, ireq->wscale_ok, ireq->rcv_wscale, 2074 ireq->sack_ok, ireq->wscale_ok, ireq->rcv_wscale,
2075 TCP_SKB_CB(skb)->when, 2075 TCP_SKB_CB(skb)->when,
2076 req->ts_recent); 2076 req->ts_recent);