diff options
| author | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-02-07 10:37:19 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-02-07 10:37:19 +0100 |
| commit | 2adf779dd193e1c8673f5896da4fef1dda830774 (patch) | |
| tree | f8014bbf33b023dd09bda6f9145bb776f73389d2 /include/linux/net.h | |
| parent | 07916eb45f4a6c63acb93e269c10490e4e623a0c (diff) | |
| parent | 0ec120046dee44027a28b66a3c28d1031982a9eb (diff) | |
Merge http://linux.bkbits.net/linux-2.5
into burns.home.kernel.dk:/usr/local/kernel/BK/linux-2.5
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 39493fc2e265..8cd440ce36d6 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -23,6 +23,7 @@ #include <linux/wait.h> struct poll_table_struct; +struct inode; #define NPROTO 32 /* should be enough for now.. */ @@ -68,7 +69,6 @@ struct socket unsigned long flags; struct proto_ops *ops; - struct inode *inode; struct fasync_struct *fasync_list; /* Asynchronous wake up list */ struct file *file; /* File back pointer for gc */ struct sock *sk; @@ -78,8 +78,6 @@ struct socket unsigned char passcred; }; -#define SOCK_INODE(S) ((S)->inode) - struct scm_cookie; struct vm_area_struct; struct page; |