diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-02 22:41:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-02 22:41:02 -0700 |
| commit | 2a3f7d0618a6ae0e54e00c5f046b3ffe8899bfdd (patch) | |
| tree | a068286cb759edfb99a69fc1732ca43b498aa6cd /include/net | |
| parent | eca56747e1b2f7d2ad2bf11da5b896ce9497279b (diff) | |
| parent | 1add9f7a56e43099c23f6ba9409278116ea1c964 (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/sigio
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/inet_common.h | 3 | ||||
| -rw-r--r-- | include/net/sock.h | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/net/inet_common.h b/include/net/inet_common.h index bbb1fa70099e..3dcab5199cc1 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -34,9 +34,6 @@ extern int inet_setsockopt(struct socket *sock, int level, extern int inet_getsockopt(struct socket *sock, int level, int optname, char *optval, int *optlen); -extern int inet_fcntl(struct socket *sock, - unsigned int cmd, - unsigned long arg); extern int inet_listen(struct socket *sock, int backlog); extern void inet_sock_release(struct sock *sk); diff --git a/include/net/sock.h b/include/net/sock.h index ccf82ecab360..da47601e4290 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -132,7 +132,6 @@ struct sock { unsigned char rcvtstamp; unsigned char no_largesend; int route_caps; - int proc; unsigned long lingertime; int hashent; @@ -292,7 +291,6 @@ static __inline__ void sock_prot_dec_use(struct proto *prot) #define SOCK_BINDADDR_LOCK 4 #define SOCK_BINDPORT_LOCK 8 -#include <linux/fs.h> /* just for inode - yeuch.*/ /* Used by processes to "lock" a socket state, so that @@ -362,6 +360,7 @@ extern struct sk_buff *sock_alloc_send_pskb(struct sock *sk, int *errcode); extern void *sock_kmalloc(struct sock *sk, int size, int priority); extern void sock_kfree_s(struct sock *sk, void *mem, int size); +extern void sk_send_sigurg(struct sock *sk); /* * Functions to fill in entries in struct proto_ops when a protocol @@ -388,8 +387,6 @@ extern int sock_no_getsockopt(struct socket *, int , int, char *, int *); extern int sock_no_setsockopt(struct socket *, int, int, char *, int); -extern int sock_no_fcntl(struct socket *, - unsigned int, unsigned long); extern int sock_no_sendmsg(struct socket *, struct msghdr *, int, struct scm_cookie *); |