diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:03:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:03:35 -0800 |
| commit | 1893f0e56ad101fb1c17fcb3cbebc32e7befd38e (patch) | |
| tree | 09cbbbff808dd606eb29079de131051b19fb861e /include/linux | |
| parent | 0f994f5d595144773374bad540af2898499df008 (diff) | |
| parent | 7b667cd3103ccbc18a33b7513605e4fe33842b2c (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/linux/tcp.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7823da595953..378777e11e94 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -29,11 +29,11 @@ #include <linux/if_ether.h> #include <linux/if_packet.h> +#ifdef __KERNEL__ #include <asm/atomic.h> #include <asm/cache.h> #include <asm/byteorder.h> -#ifdef __KERNEL__ #include <linux/config.h> #include <linux/device.h> #include <linux/percpu.h> diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 1b35358879ce..71217944640a 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -377,7 +377,6 @@ struct tcp_opt { /* TCP Westwood structure */ struct { - __u32 bw_sample; /* bandwidth sample */ __u32 bw_ns_est; /* first bandwidth estimation..not too smoothed 8) */ __u32 bw_est; /* bandwidth estimate */ __u32 rtt_win_sx; /* here starts a new evaluation... */ |