diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
| commit | b194b4250c2b7e9d762823ac6045316fcd4bf4f9 (patch) | |
| tree | 8c54b5004822958ef0a7603e76a4868582e26d7f /include/net/inet_connection_sock.h | |
| parent | c4052da6f0c01a0b059d125d72bb934d0980b798 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/net/inet_connection_sock.h')
| -rw-r--r-- | include/net/inet_connection_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 651f824c1008..b0c99060b78d 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h | |||
| @@ -94,7 +94,7 @@ static inline void *inet_csk_ca(const struct sock *sk) | |||
| 94 | 94 | ||
| 95 | extern struct sock *inet_csk_clone(struct sock *sk, | 95 | extern struct sock *inet_csk_clone(struct sock *sk, |
| 96 | const struct request_sock *req, | 96 | const struct request_sock *req, |
| 97 | const unsigned int __nocast priority); | 97 | const gfp_t priority); |
| 98 | 98 | ||
| 99 | enum inet_csk_ack_state_t { | 99 | enum inet_csk_ack_state_t { |
| 100 | ICSK_ACK_SCHED = 1, | 100 | ICSK_ACK_SCHED = 1, |