diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /include/net | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/dn.h | 4 | ||||
| -rw-r--r-- | include/net/if_inet6.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/net/dn.h b/include/net/dn.h index c1d4854de..52c6ba44d 100644 --- a/include/net/dn.h +++ b/include/net/dn.h @@ -6,8 +6,8 @@ typedef unsigned short dn_address; -#define dn_ntohs(x) le16_to_cpu(x) -#define dn_htons(x) cpu_to_le16(x) +#define dn_ntohs(x) le16_to_cpu((unsigned short)(x)) +#define dn_htons(x) cpu_to_le16((unsigned short)(x)) struct dn_scp /* Session Control Port */ { diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index d816d4fac..2ea636834 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -64,7 +64,9 @@ struct ifmcaddr6 struct ifmcaddr6 *next; struct timer_list mca_timer; unsigned mca_flags; - atomic_t mca_users; + int mca_users; + atomic_t mca_refcnt; + spinlock_t mca_lock; }; #define IFA_HOST IPV6_ADDR_LOOPBACK |