diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/tcp.h | 2 | ||||
-rw-r--r-- | include/net/tcp_ecn.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 6dacc352dcf1..af9273204cfd 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -984,7 +984,7 @@ static inline void tcp_openreq_init(struct request_sock *req, | |||
984 | ireq->wscale_ok = rx_opt->wscale_ok; | 984 | ireq->wscale_ok = rx_opt->wscale_ok; |
985 | ireq->acked = 0; | 985 | ireq->acked = 0; |
986 | ireq->ecn_ok = 0; | 986 | ireq->ecn_ok = 0; |
987 | ireq->rmt_port = skb->h.th->source; | 987 | ireq->rmt_port = tcp_hdr(skb)->source; |
988 | } | 988 | } |
989 | 989 | ||
990 | extern void tcp_enter_memory_pressure(void); | 990 | extern void tcp_enter_memory_pressure(void); |
diff --git a/include/net/tcp_ecn.h b/include/net/tcp_ecn.h index 4629d77173f2..b5f7c6ac0880 100644 --- a/include/net/tcp_ecn.h +++ b/include/net/tcp_ecn.h | |||
@@ -54,7 +54,7 @@ static inline void TCP_ECN_send(struct sock *sk, struct tcp_sock *tp, | |||
54 | INET_ECN_xmit(sk); | 54 | INET_ECN_xmit(sk); |
55 | if (tp->ecn_flags&TCP_ECN_QUEUE_CWR) { | 55 | if (tp->ecn_flags&TCP_ECN_QUEUE_CWR) { |
56 | tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; | 56 | tp->ecn_flags &= ~TCP_ECN_QUEUE_CWR; |
57 | skb->h.th->cwr = 1; | 57 | tcp_hdr(skb)->cwr = 1; |
58 | skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN; | 58 | skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN; |
59 | } | 59 | } |
60 | } else { | 60 | } else { |
@@ -62,7 +62,7 @@ static inline void TCP_ECN_send(struct sock *sk, struct tcp_sock *tp, | |||
62 | INET_ECN_dontxmit(sk); | 62 | INET_ECN_dontxmit(sk); |
63 | } | 63 | } |
64 | if (tp->ecn_flags & TCP_ECN_DEMAND_CWR) | 64 | if (tp->ecn_flags & TCP_ECN_DEMAND_CWR) |
65 | skb->h.th->ece = 1; | 65 | tcp_hdr(skb)->ece = 1; |
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
@@ -70,7 +70,7 @@ static inline void TCP_ECN_send(struct sock *sk, struct tcp_sock *tp, | |||
70 | 70 | ||
71 | static inline void TCP_ECN_accept_cwr(struct tcp_sock *tp, struct sk_buff *skb) | 71 | static inline void TCP_ECN_accept_cwr(struct tcp_sock *tp, struct sk_buff *skb) |
72 | { | 72 | { |
73 | if (skb->h.th->cwr) | 73 | if (tcp_hdr(skb)->cwr) |
74 | tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR; | 74 | tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR; |
75 | } | 75 | } |
76 | 76 | ||