diff options
author | Andrea Bittau <a.bittau@cs.ucl.ac.uk> | 2006-09-19 16:06:16 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 18:19:09 -0400 |
commit | 4a0a50fb43912b4a593d2416c507a198fe607a6d (patch) | |
tree | 24b09ba4c83942c2ccec0261affdcbc68a2f335c /net/dccp | |
parent | 8e27e4650cb7e73aa4dd97d860539e7605ac7e39 (diff) |
[DCCP] ackvec: Remove unused variables
Get rid of unused variables in ackvector state.
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ackvec.c | 5 | ||||
-rw-r--r-- | net/dccp/ackvec.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index bc5ff1212418..4d176d33983f 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c | |||
@@ -142,14 +142,13 @@ struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority) | |||
142 | struct dccp_ackvec *av = kmem_cache_alloc(dccp_ackvec_slab, priority); | 142 | struct dccp_ackvec *av = kmem_cache_alloc(dccp_ackvec_slab, priority); |
143 | 143 | ||
144 | if (av != NULL) { | 144 | if (av != NULL) { |
145 | av->dccpav_buf_head = | 145 | av->dccpav_buf_head = DCCP_MAX_ACKVEC_LEN - 1; |
146 | av->dccpav_buf_tail = DCCP_MAX_ACKVEC_LEN - 1; | ||
147 | av->dccpav_buf_ackno = DCCP_MAX_SEQNO + 1; | 146 | av->dccpav_buf_ackno = DCCP_MAX_SEQNO + 1; |
148 | av->dccpav_buf_nonce = av->dccpav_buf_nonce = 0; | 147 | av->dccpav_buf_nonce = av->dccpav_buf_nonce = 0; |
149 | av->dccpav_ack_ptr = 0; | 148 | av->dccpav_ack_ptr = 0; |
150 | av->dccpav_time.tv_sec = 0; | 149 | av->dccpav_time.tv_sec = 0; |
151 | av->dccpav_time.tv_usec = 0; | 150 | av->dccpav_time.tv_usec = 0; |
152 | av->dccpav_sent_len = av->dccpav_vec_len = 0; | 151 | av->dccpav_vec_len = 0; |
153 | INIT_LIST_HEAD(&av->dccpav_records); | 152 | INIT_LIST_HEAD(&av->dccpav_records); |
154 | } | 153 | } |
155 | 154 | ||
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h index 0adf4b56c34c..2424effac7f6 100644 --- a/net/dccp/ackvec.h +++ b/net/dccp/ackvec.h | |||
@@ -54,9 +54,7 @@ struct dccp_ackvec { | |||
54 | struct list_head dccpav_records; | 54 | struct list_head dccpav_records; |
55 | struct timeval dccpav_time; | 55 | struct timeval dccpav_time; |
56 | u8 dccpav_buf_head; | 56 | u8 dccpav_buf_head; |
57 | u8 dccpav_buf_tail; | ||
58 | u8 dccpav_ack_ptr; | 57 | u8 dccpav_ack_ptr; |
59 | u8 dccpav_sent_len; | ||
60 | u8 dccpav_vec_len; | 58 | u8 dccpav_vec_len; |
61 | u8 dccpav_buf_nonce; | 59 | u8 dccpav_buf_nonce; |
62 | u8 dccpav_ack_nonce; | 60 | u8 dccpav_ack_nonce; |
@@ -107,7 +105,7 @@ extern int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb); | |||
107 | 105 | ||
108 | static inline int dccp_ackvec_pending(const struct dccp_ackvec *av) | 106 | static inline int dccp_ackvec_pending(const struct dccp_ackvec *av) |
109 | { | 107 | { |
110 | return av->dccpav_sent_len != av->dccpav_vec_len; | 108 | return av->dccpav_vec_len; |
111 | } | 109 | } |
112 | #else /* CONFIG_IP_DCCP_ACKVEC */ | 110 | #else /* CONFIG_IP_DCCP_ACKVEC */ |
113 | static inline int dccp_ackvec_init(void) | 111 | static inline int dccp_ackvec_init(void) |