diff options
Diffstat (limited to 'include/net/tcp_ecn.h')
| -rw-r--r-- | include/net/tcp_ecn.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/net/tcp_ecn.h b/include/net/tcp_ecn.h index dc1456389a97..64980ee8c92a 100644 --- a/include/net/tcp_ecn.h +++ b/include/net/tcp_ecn.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _NET_TCP_ECN_H_ 1 | 2 | #define _NET_TCP_ECN_H_ 1 |
| 3 | 3 | ||
| 4 | #include <net/inet_ecn.h> | 4 | #include <net/inet_ecn.h> |
| 5 | #include <net/request_sock.h> | ||
| 5 | 6 | ||
| 6 | #define TCP_HP_BITS (~(TCP_RESERVED_BITS|TCP_FLAG_PSH)) | 7 | #define TCP_HP_BITS (~(TCP_RESERVED_BITS|TCP_FLAG_PSH)) |
| 7 | 8 | ||
| @@ -38,9 +39,9 @@ static inline void TCP_ECN_send_syn(struct sock *sk, struct tcp_sock *tp, | |||
| 38 | } | 39 | } |
| 39 | 40 | ||
| 40 | static __inline__ void | 41 | static __inline__ void |
| 41 | TCP_ECN_make_synack(struct open_request *req, struct tcphdr *th) | 42 | TCP_ECN_make_synack(struct request_sock *req, struct tcphdr *th) |
| 42 | { | 43 | { |
| 43 | if (req->ecn_ok) | 44 | if (inet_rsk(req)->ecn_ok) |
| 44 | th->ece = 1; | 45 | th->ece = 1; |
| 45 | } | 46 | } |
| 46 | 47 | ||
| @@ -111,16 +112,16 @@ static inline int TCP_ECN_rcv_ecn_echo(struct tcp_sock *tp, struct tcphdr *th) | |||
| 111 | } | 112 | } |
| 112 | 113 | ||
| 113 | static inline void TCP_ECN_openreq_child(struct tcp_sock *tp, | 114 | static inline void TCP_ECN_openreq_child(struct tcp_sock *tp, |
| 114 | struct open_request *req) | 115 | struct request_sock *req) |
| 115 | { | 116 | { |
| 116 | tp->ecn_flags = req->ecn_ok ? TCP_ECN_OK : 0; | 117 | tp->ecn_flags = inet_rsk(req)->ecn_ok ? TCP_ECN_OK : 0; |
| 117 | } | 118 | } |
| 118 | 119 | ||
| 119 | static __inline__ void | 120 | static __inline__ void |
| 120 | TCP_ECN_create_request(struct open_request *req, struct tcphdr *th) | 121 | TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th) |
| 121 | { | 122 | { |
| 122 | if (sysctl_tcp_ecn && th->ece && th->cwr) | 123 | if (sysctl_tcp_ecn && th->ece && th->cwr) |
| 123 | req->ecn_ok = 1; | 124 | inet_rsk(req)->ecn_ok = 1; |
| 124 | } | 125 | } |
| 125 | 126 | ||
| 126 | #endif | 127 | #endif |
