diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-31 20:44:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-31 20:44:09 -0700 |
| commit | b5b2042ed20c107d7a5058663de04b3ef6ca34b2 (patch) | |
| tree | 6e8654f842cb0644aab593bdec7c94dd971b908a /include | |
| parent | bae9e1dd97a137ba250b3ff6971572ef49ae7af3 (diff) | |
| parent | 651c8f88d05cc4bee07381849ebd3c11b4d00894 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/igmp.h | 2 | ||||
| -rw-r--r-- | include/net/tcp.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index 76cf68f03c25..fd28c22a5036 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -115,7 +115,7 @@ extern void ip_mc_init_dev(struct in_device *); extern void ip_mc_destroy_dev(struct in_device *); extern void ip_mc_up(struct in_device *); extern void ip_mc_down(struct in_device *); -extern int ip_mc_dec_group(struct in_device *in_dev, u32 addr); +extern void ip_mc_dec_group(struct in_device *in_dev, u32 addr); extern void ip_mc_inc_group(struct in_device *in_dev, u32 addr); #endif #endif diff --git a/include/net/tcp.h b/include/net/tcp.h index e6382e0539e1..0dd375b7fd4b 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -27,6 +27,7 @@ #include <linux/config.h> #include <linux/tcp.h> #include <linux/slab.h> +#include <linux/cache.h> #include <net/checksum.h> #include <net/sock.h> #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) @@ -120,8 +121,7 @@ extern struct tcp_hashinfo { * Now align to a new cache line as all the following members * are often dirty. */ - rwlock_t __tcp_lhash_lock - __attribute__((__aligned__(SMP_CACHE_BYTES))); + rwlock_t __tcp_lhash_lock ____cacheline_aligned; atomic_t __tcp_lhash_users; wait_queue_head_t __tcp_lhash_wait; spinlock_t __tcp_portalloc_lock; |