diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/net | |
parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ax25.h | 10 | ||||
-rw-r--r-- | include/net/inet_timewait_sock.h | 2 | ||||
-rw-r--r-- | include/net/netrom.h | 8 | ||||
-rw-r--r-- | include/net/rose.h | 14 | ||||
-rw-r--r-- | include/net/sctp/structs.h | 1 | ||||
-rw-r--r-- | include/net/sock.h | 2 |
6 files changed, 19 insertions, 18 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index b74945288dfc..7cd528e9d668 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h | |||
@@ -144,14 +144,14 @@ enum { | |||
144 | #define AX25_DEF_CONMODE 2 /* Connected mode allowed */ | 144 | #define AX25_DEF_CONMODE 2 /* Connected mode allowed */ |
145 | #define AX25_DEF_WINDOW 2 /* Window=2 */ | 145 | #define AX25_DEF_WINDOW 2 /* Window=2 */ |
146 | #define AX25_DEF_EWINDOW 32 /* Module-128 Window=32 */ | 146 | #define AX25_DEF_EWINDOW 32 /* Module-128 Window=32 */ |
147 | #define AX25_DEF_T1 (10 * HZ) /* T1=10s */ | 147 | #define AX25_DEF_T1 10000 /* T1=10s */ |
148 | #define AX25_DEF_T2 (3 * HZ) /* T2=3s */ | 148 | #define AX25_DEF_T2 3000 /* T2=3s */ |
149 | #define AX25_DEF_T3 (300 * HZ) /* T3=300s */ | 149 | #define AX25_DEF_T3 300000 /* T3=300s */ |
150 | #define AX25_DEF_N2 10 /* N2=10 */ | 150 | #define AX25_DEF_N2 10 /* N2=10 */ |
151 | #define AX25_DEF_IDLE (0 * 60 * HZ) /* Idle=None */ | 151 | #define AX25_DEF_IDLE 0 /* Idle=None */ |
152 | #define AX25_DEF_PACLEN 256 /* Paclen=256 */ | 152 | #define AX25_DEF_PACLEN 256 /* Paclen=256 */ |
153 | #define AX25_DEF_PROTOCOL AX25_PROTO_STD_SIMPLEX /* Standard AX.25 */ | 153 | #define AX25_DEF_PROTOCOL AX25_PROTO_STD_SIMPLEX /* Standard AX.25 */ |
154 | #define AX25_DEF_DS_TIMEOUT (3 * 60 * HZ) /* DAMA timeout 3 minutes */ | 154 | #define AX25_DEF_DS_TIMEOUT 180000 /* DAMA timeout 3 minutes */ |
155 | 155 | ||
156 | typedef struct ax25_uid_assoc { | 156 | typedef struct ax25_uid_assoc { |
157 | struct hlist_node uid_node; | 157 | struct hlist_node uid_node; |
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 519d3a077c62..600cb543550d 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
@@ -149,7 +149,7 @@ static inline void inet_twsk_add_bind_node(struct inet_timewait_sock *tw, | |||
149 | 149 | ||
150 | static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw) | 150 | static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw) |
151 | { | 151 | { |
152 | return tw->tw_death_node.pprev != NULL; | 152 | return !hlist_unhashed(&tw->tw_death_node); |
153 | } | 153 | } |
154 | 154 | ||
155 | static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw) | 155 | static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw) |
diff --git a/include/net/netrom.h b/include/net/netrom.h index a5ee53bce62f..e0ca112024a3 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h | |||
@@ -42,11 +42,11 @@ enum { | |||
42 | #define NR_COND_PEER_RX_BUSY 0x04 | 42 | #define NR_COND_PEER_RX_BUSY 0x04 |
43 | #define NR_COND_OWN_RX_BUSY 0x08 | 43 | #define NR_COND_OWN_RX_BUSY 0x08 |
44 | 44 | ||
45 | #define NR_DEFAULT_T1 (120 * HZ) /* Outstanding frames - 120 seconds */ | 45 | #define NR_DEFAULT_T1 120000 /* Outstanding frames - 120 seconds */ |
46 | #define NR_DEFAULT_T2 (5 * HZ) /* Response delay - 5 seconds */ | 46 | #define NR_DEFAULT_T2 5000 /* Response delay - 5 seconds */ |
47 | #define NR_DEFAULT_N2 3 /* Number of Retries - 3 */ | 47 | #define NR_DEFAULT_N2 3 /* Number of Retries - 3 */ |
48 | #define NR_DEFAULT_T4 (180 * HZ) /* Busy Delay - 180 seconds */ | 48 | #define NR_DEFAULT_T4 180000 /* Busy Delay - 180 seconds */ |
49 | #define NR_DEFAULT_IDLE (0 * 60 * HZ) /* No Activity Timeout - none */ | 49 | #define NR_DEFAULT_IDLE 0 /* No Activity Timeout - none */ |
50 | #define NR_DEFAULT_WINDOW 4 /* Default Window Size - 4 */ | 50 | #define NR_DEFAULT_WINDOW 4 /* Default Window Size - 4 */ |
51 | #define NR_DEFAULT_OBS 6 /* Default Obsolescence Count - 6 */ | 51 | #define NR_DEFAULT_OBS 6 /* Default Obsolescence Count - 6 */ |
52 | #define NR_DEFAULT_QUAL 10 /* Default Neighbour Quality - 10 */ | 52 | #define NR_DEFAULT_QUAL 10 /* Default Neighbour Quality - 10 */ |
diff --git a/include/net/rose.h b/include/net/rose.h index 3249b979605a..012b09ed2401 100644 --- a/include/net/rose.h +++ b/include/net/rose.h | |||
@@ -49,14 +49,14 @@ enum { | |||
49 | ROSE_STATE_5 /* Deferred Call Acceptance */ | 49 | ROSE_STATE_5 /* Deferred Call Acceptance */ |
50 | }; | 50 | }; |
51 | 51 | ||
52 | #define ROSE_DEFAULT_T0 (180 * HZ) /* Default T10 T20 value */ | 52 | #define ROSE_DEFAULT_T0 180000 /* Default T10 T20 value */ |
53 | #define ROSE_DEFAULT_T1 (200 * HZ) /* Default T11 T21 value */ | 53 | #define ROSE_DEFAULT_T1 200000 /* Default T11 T21 value */ |
54 | #define ROSE_DEFAULT_T2 (180 * HZ) /* Default T12 T22 value */ | 54 | #define ROSE_DEFAULT_T2 180000 /* Default T12 T22 value */ |
55 | #define ROSE_DEFAULT_T3 (180 * HZ) /* Default T13 T23 value */ | 55 | #define ROSE_DEFAULT_T3 180000 /* Default T13 T23 value */ |
56 | #define ROSE_DEFAULT_HB (5 * HZ) /* Default Holdback value */ | 56 | #define ROSE_DEFAULT_HB 5000 /* Default Holdback value */ |
57 | #define ROSE_DEFAULT_IDLE (0 * 60 * HZ) /* No Activity Timeout - none */ | 57 | #define ROSE_DEFAULT_IDLE 0 /* No Activity Timeout - none */ |
58 | #define ROSE_DEFAULT_ROUTING 1 /* Default routing flag */ | 58 | #define ROSE_DEFAULT_ROUTING 1 /* Default routing flag */ |
59 | #define ROSE_DEFAULT_FAIL_TIMEOUT (120 * HZ) /* Time until link considered usable */ | 59 | #define ROSE_DEFAULT_FAIL_TIMEOUT 120000 /* Time until link considered usable */ |
60 | #define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */ | 60 | #define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */ |
61 | #define ROSE_DEFAULT_WINDOW_SIZE 7 /* Default window size */ | 61 | #define ROSE_DEFAULT_WINDOW_SIZE 7 /* Default window size */ |
62 | 62 | ||
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index eba99f375517..7f4fea173fb1 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
@@ -712,6 +712,7 @@ struct sctp_chunk { | |||
712 | __u8 tsn_gap_acked; /* Is this chunk acked by a GAP ACK? */ | 712 | __u8 tsn_gap_acked; /* Is this chunk acked by a GAP ACK? */ |
713 | __s8 fast_retransmit; /* Is this chunk fast retransmitted? */ | 713 | __s8 fast_retransmit; /* Is this chunk fast retransmitted? */ |
714 | __u8 tsn_missing_report; /* Data chunk missing counter. */ | 714 | __u8 tsn_missing_report; /* Data chunk missing counter. */ |
715 | __u8 data_accepted; /* At least 1 chunk in this packet accepted */ | ||
715 | }; | 716 | }; |
716 | 717 | ||
717 | void sctp_chunk_hold(struct sctp_chunk *); | 718 | void sctp_chunk_hold(struct sctp_chunk *); |
diff --git a/include/net/sock.h b/include/net/sock.h index d8a5d87ad145..d27e748a8259 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -278,7 +278,7 @@ static inline int sk_unhashed(const struct sock *sk) | |||
278 | 278 | ||
279 | static inline int sk_hashed(const struct sock *sk) | 279 | static inline int sk_hashed(const struct sock *sk) |
280 | { | 280 | { |
281 | return sk->sk_node.pprev != NULL; | 281 | return !sk_unhashed(sk); |
282 | } | 282 | } |
283 | 283 | ||
284 | static __inline__ void sk_node_init(struct hlist_node *node) | 284 | static __inline__ void sk_node_init(struct hlist_node *node) |