diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
| commit | 5205a16d8870cdd4cc524589de3e09ad176d129a (patch) | |
| tree | 6deddf1269b9e6f13f2fa00529cd4674c3b2a3fa /include/linux | |
| parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) | |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_conntrack.h | 9 | ||||
| -rw-r--r-- | include/linux/socket.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index 1836dda48..e39d83dce 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -48,13 +48,16 @@ do { \ /* Bitset representing status of connection. */ enum ip_conntrack_status { /* It's an expected connection: bit 0 set. This bit never changed */ - IPS_EXPECTED = 0x01, + IPS_EXPECTED_BIT = 0, + IPS_EXPECTED = (1 << IPS_EXPECTED_BIT), /* We've seen packets both ways: bit 1 set. Can be set, not unset. */ - IPS_SEEN_REPLY = 0x02, + IPS_SEEN_REPLY_BIT = 1, + IPS_SEEN_REPLY = (1 << IPS_SEEN_REPLY_BIT), /* Packet seen leaving box: bit 2 set. Can be set, not unset. */ - IPS_CONFIRMED = 0x04 + IPS_CONFIRMED_BIT = 2, + IPS_CONFIRMED = (1 << IPS_CONFIRMED_BIT) }; struct ip_conntrack_expect diff --git a/include/linux/socket.h b/include/linux/socket.h index 6c590a531..9350cac6b 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -76,7 +76,7 @@ struct cmsghdr { */ #ifdef __KERNEL__ -#define __KINLINE extern __inline__ +#define __KINLINE static inline #elif defined(__GNUC__) #define __KINLINE static __inline__ #elif defined(__cplusplus) |