diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-03-14 23:46:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-03-14 23:46:55 -0800 |
| commit | 7b667cd3103ccbc18a33b7513605e4fe33842b2c (patch) | |
| tree | b09c0e317fbb279db11ed2b54e4f1eac7b4d8f5a /include/linux | |
| parent | 92c06c66547965cefa126edbcd3112803267204a (diff) | |
| parent | ee127b1d19f2f06ac59c806526f93309429b6991 (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
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... */ |