summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-11-02 19:51:21 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-02 19:51:21 -0800
commitf48bbcdf2231f55dd0404de24220e41ccb48e4c7 (patch)
treeedc7e45c54f54c8312828df58786390a50ff9986 /include/net
parent317b795b6e6e9bde8cbd8921dd129a51b7a4445b (diff)
parent3a35d84ab5e98eb27a3be47eaee3392ea4fd7c10 (diff)
Merge epoll update
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 4a4094b93d07..d2790e2ca00a 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -52,9 +52,6 @@
#include <asm/atomic.h>
#include <net/dst.h>
#include <net/scm.h>
-#include <linux/fs.h>
-#include <linux/file.h>
-#include <linux/fcblist.h>
/*
* This structure really needs to be cleaned up.
@@ -769,13 +766,8 @@ static inline unsigned long sock_wspace(struct sock *sk)
static inline void sk_wake_async(struct sock *sk, int how, int band)
{
- if (sk->socket) {
- if (sk->socket->file)
- file_send_notify(sk->socket->file, ion_band_table[band - POLL_IN],
- poll_band_table[band - POLL_IN]);
- if (sk->socket->fasync_list)
- sock_wake_async(sk->socket, how, band);
- }
+ if (sk->socket && sk->socket->fasync_list)
+ sock_wake_async(sk->socket, how, band);
}
#define SOCK_MIN_SNDBUF 2048