diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-16 05:33:41 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 05:33:41 -0500 |
| commit | fe705ab1526bc2c8b7756f3a855f040ab2060af2 (patch) | |
| tree | c4444d19983c5578f9ef2bddc1fa01b6e42f91a3 /include/net/tcp.h | |
| parent | 7d1794e81b5f202c73d7e3e65f0ee7aae4928038 (diff) | |
| parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
Merge branch 'topic/beep-rename' into topic/hda
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 56b76027b85e..03a49c703377 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -394,13 +394,13 @@ extern int tcp_getsockopt(struct sock *sk, int level, | |||
| 394 | int __user *optlen); | 394 | int __user *optlen); |
| 395 | extern int tcp_setsockopt(struct sock *sk, int level, | 395 | extern int tcp_setsockopt(struct sock *sk, int level, |
| 396 | int optname, char __user *optval, | 396 | int optname, char __user *optval, |
| 397 | int optlen); | 397 | unsigned int optlen); |
| 398 | extern int compat_tcp_getsockopt(struct sock *sk, | 398 | extern int compat_tcp_getsockopt(struct sock *sk, |
| 399 | int level, int optname, | 399 | int level, int optname, |
| 400 | char __user *optval, int __user *optlen); | 400 | char __user *optval, int __user *optlen); |
| 401 | extern int compat_tcp_setsockopt(struct sock *sk, | 401 | extern int compat_tcp_setsockopt(struct sock *sk, |
| 402 | int level, int optname, | 402 | int level, int optname, |
| 403 | char __user *optval, int optlen); | 403 | char __user *optval, unsigned int optlen); |
| 404 | extern void tcp_set_keepalive(struct sock *sk, int val); | 404 | extern void tcp_set_keepalive(struct sock *sk, int val); |
| 405 | extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, | 405 | extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, |
| 406 | struct msghdr *msg, | 406 | struct msghdr *msg, |