diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-10-11 10:37:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-10-11 10:37:22 -0700 |
| commit | f1f57ebfd87a537a6b93479432b0f357721363a0 (patch) | |
| tree | 3f71115d2286311e34452805465bb4c901d04d84 /include/linux | |
| parent | e856ba4ac9cc2c405d062c496ec125b63c502e4d (diff) | |
| parent | 1845112b7a81bfc41a529d9c54df8806fbd2fafb (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/net.h | 17 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 3 | ||||
| -rw-r--r-- | include/linux/tcp.h | 3 |
3 files changed, 16 insertions, 7 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index c84c7033fed1..47a3beb092cb 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -81,6 +81,7 @@ struct socket struct scm_cookie; struct vm_area_struct; struct page; +struct kiocb; struct proto_ops { int family; @@ -104,8 +105,12 @@ struct proto_ops { char *optval, int optlen); int (*getsockopt) (struct socket *sock, int level, int optname, char *optval, int *optlen); - int (*sendmsg) (struct socket *sock, struct msghdr *m, int total_len, struct scm_cookie *scm); - int (*recvmsg) (struct socket *sock, struct msghdr *m, int total_len, int flags, struct scm_cookie *scm); + int (*sendmsg) (struct kiocb *iocb, struct socket *sock, + struct msghdr *m, int total_len, + struct scm_cookie *scm); + int (*recvmsg) (struct kiocb *iocb, struct socket *sock, + struct msghdr *m, int total_len, int flags, + struct scm_cookie *scm); int (*mmap) (struct file *file, struct socket *sock, struct vm_area_struct * vma); ssize_t (*sendpage) (struct socket *sock, struct page *page, int offset, size_t size, int flags); }; @@ -194,10 +199,10 @@ SOCKCALL_WRAP(name, setsockopt, (struct socket *sock, int level, int optname, \ char *optval, int optlen), (sock, level, optname, optval, optlen)) \ SOCKCALL_WRAP(name, getsockopt, (struct socket *sock, int level, int optname, \ char *optval, int *optlen), (sock, level, optname, optval, optlen)) \ -SOCKCALL_WRAP(name, sendmsg, (struct socket *sock, struct msghdr *m, int len, struct scm_cookie *scm), \ - (sock, m, len, scm)) \ -SOCKCALL_WRAP(name, recvmsg, (struct socket *sock, struct msghdr *m, int len, int flags, struct scm_cookie *scm), \ - (sock, m, len, flags, scm)) \ +SOCKCALL_WRAP(name, sendmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, int len, struct scm_cookie *scm), \ + (iocb, sock, m, len, scm)) \ +SOCKCALL_WRAP(name, recvmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, int len, int flags, struct scm_cookie *scm), \ + (iocb, sock, m, len, flags, scm)) \ SOCKCALL_WRAP(name, mmap, (struct file *file, struct socket *sock, struct vm_area_struct *vma), \ (file, sock, vma)) \ \ diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 9fd7d5c05605..0fb31130009d 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -301,7 +301,8 @@ enum NET_IPV4_NONLOCAL_BIND=88, NET_IPV4_ICMP_RATELIMIT=89, NET_IPV4_ICMP_RATEMASK=90, - NET_TCP_TW_REUSE=91 + NET_TCP_TW_REUSE=91, + NET_TCP_FRTO=92 }; enum { diff --git a/include/linux/tcp.h b/include/linux/tcp.h index ce34341d6a2c..91b66d7ab004 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -366,6 +366,9 @@ struct tcp_opt { unsigned int keepalive_intvl; /* time interval between keep alive probes */ int linger2; + int frto_counter; /* Number of new acks after RTO */ + __u32 frto_highmark; /* snd_nxt when RTO occurred */ + unsigned long last_synq_overflow; }; |