diff options
author | Sebastian Siewior <sebastian@breakpoint.cc> | 2007-07-27 16:59:49 -0400 |
---|---|---|
committer | Vlad Yasevich <vladislav.yasevich@hp.com> | 2007-08-01 11:19:06 -0400 |
commit | cc121fa87a0ce356c23fb4d7358310e747cad8cc (patch) | |
tree | 3d53e3672ab62a1259cb80d736e71058566f80d9 /net | |
parent | d6f9fdaf643eca8fb49fffdd6269b78f4ef1ef86 (diff) |
sctp: fix shadow symbol in net/sctp/tsnmap.c
net/sctp/tsnmap.c:164:16: warning: symbol '_end' shadows an earlier one
include/asm-generic/sections.h:13:13: originally declared here
Renamed renamed _end to end_ and _start (for consistence).
Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sctp/tsnmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sctp/tsnmap.c b/net/sctp/tsnmap.c index d3192a1babc..1ff0daade30 100644 --- a/net/sctp/tsnmap.c +++ b/net/sctp/tsnmap.c | |||
@@ -161,7 +161,7 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map, | |||
161 | __u16 *start, __u16 *end) | 161 | __u16 *start, __u16 *end) |
162 | { | 162 | { |
163 | int started, ended; | 163 | int started, ended; |
164 | __u16 _start, _end, offset; | 164 | __u16 start_, end_, offset; |
165 | 165 | ||
166 | /* We haven't found a gap yet. */ | 166 | /* We haven't found a gap yet. */ |
167 | started = ended = 0; | 167 | started = ended = 0; |
@@ -175,7 +175,7 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map, | |||
175 | 175 | ||
176 | offset = iter->start - map->base_tsn; | 176 | offset = iter->start - map->base_tsn; |
177 | sctp_tsnmap_find_gap_ack(map->tsn_map, offset, map->len, 0, | 177 | sctp_tsnmap_find_gap_ack(map->tsn_map, offset, map->len, 0, |
178 | &started, &_start, &ended, &_end); | 178 | &started, &start_, &ended, &end_); |
179 | } | 179 | } |
180 | 180 | ||
181 | /* Do we need to check the overflow map? */ | 181 | /* Do we need to check the overflow map? */ |
@@ -193,8 +193,8 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map, | |||
193 | offset, | 193 | offset, |
194 | map->len, | 194 | map->len, |
195 | map->len, | 195 | map->len, |
196 | &started, &_start, | 196 | &started, &start_, |
197 | &ended, &_end); | 197 | &ended, &end_); |
198 | } | 198 | } |
199 | 199 | ||
200 | /* The Gap Ack Block happens to end at the end of the | 200 | /* The Gap Ack Block happens to end at the end of the |
@@ -202,7 +202,7 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map, | |||
202 | */ | 202 | */ |
203 | if (started && !ended) { | 203 | if (started && !ended) { |
204 | ended++; | 204 | ended++; |
205 | _end = map->len + map->len - 1; | 205 | end_ = map->len + map->len - 1; |
206 | } | 206 | } |
207 | 207 | ||
208 | /* If we found a Gap Ack Block, return the start and end and | 208 | /* If we found a Gap Ack Block, return the start and end and |
@@ -215,8 +215,8 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map, | |||
215 | int gap = map->cumulative_tsn_ack_point - | 215 | int gap = map->cumulative_tsn_ack_point - |
216 | map->base_tsn; | 216 | map->base_tsn; |
217 | 217 | ||
218 | *start = _start - gap; | 218 | *start = start_ - gap; |
219 | *end = _end - gap; | 219 | *end = end_ - gap; |
220 | 220 | ||
221 | /* Move the iterator forward. */ | 221 | /* Move the iterator forward. */ |
222 | iter->start = map->cumulative_tsn_ack_point + *end + 1; | 222 | iter->start = map->cumulative_tsn_ack_point + *end + 1; |