diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-30 20:38:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-30 20:38:52 -0700 |
| commit | a4d37b10b0860cb91dba1052a2b86655f2dce08e (patch) | |
| tree | 89793ab145eb36d2d08eaa1c0481de07f8a151e2 /include/linux | |
| parent | 63f29ea2b2d62042d9721722da868be173c61af4 (diff) | |
| parent | bc5359b2179925c3e8ab236aae6d6847e51503b3 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/inet.h | 1 | ||||
| -rw-r--r-- | include/linux/kernel_stat.h | 3 | ||||
| -rw-r--r-- | include/linux/tcp.h | 2 | ||||
| -rw-r--r-- | include/linux/wanrouter.h | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/inet.h b/include/linux/inet.h index 940f3208aabe..ffbfe45a365d 100644 --- a/include/linux/inet.h +++ b/include/linux/inet.h @@ -47,7 +47,6 @@ #include <linux/net.h> extern void inet_proto_init(struct net_proto *pro); -extern char *in_ntoa(__u32 in); extern __u32 in_aton(const char *str); #endif diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index a75048fbcc4e..1fe3cc130019 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -29,9 +29,6 @@ struct kernel_stat { #if !defined(CONFIG_ARCH_S390) unsigned int irqs[NR_CPUS][NR_IRQS]; #endif - unsigned int ipackets, opackets; - unsigned int ierrors, oerrors; - unsigned int collisions; }; extern struct kernel_stat kstat; diff --git a/include/linux/tcp.h b/include/linux/tcp.h index f23f093bdd3e..24cc0ac95504 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -231,9 +231,9 @@ struct tcp_opt { /* Data for direct copy to user */ struct { struct sk_buff_head prequeue; - int memory; struct task_struct *task; struct iovec *iov; + int memory; int len; } ucopy; diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h index 6dc5d43a378a..54b0966cb1ac 100644 --- a/include/linux/wanrouter.h +++ b/include/linux/wanrouter.h @@ -475,7 +475,6 @@ typedef struct wanif_conf #include <linux/fs.h> /* support for device drivers */ #include <linux/proc_fs.h> /* proc filesystem pragmatics */ -#include <linux/inet.h> /* in_aton(), in_ntoa() prototypes */ #include <linux/netdevice.h> /* support for network drivers */ /*---------------------------------------------------------------------------- * WAN device data space. |