Skip to content

Commit

Permalink
sctp: fix shadow symbol in net/sctp/tsnmap.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Siewior authored and Vlad Yasevich committed Aug 1, 2007
1 parent d6f9fda commit cc121fa
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/sctp/tsnmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map,
__u16 *start, __u16 *end)
{
int started, ended;
__u16 _start, _end, offset;
__u16 start_, end_, offset;

/* We haven't found a gap yet. */
started = ended = 0;
Expand All @@ -175,7 +175,7 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map,

offset = iter->start - map->base_tsn;
sctp_tsnmap_find_gap_ack(map->tsn_map, offset, map->len, 0,
&started, &_start, &ended, &_end);
&started, &start_, &ended, &end_);
}

/* Do we need to check the overflow map? */
Expand All @@ -193,16 +193,16 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map,
offset,
map->len,
map->len,
&started, &_start,
&ended, &_end);
&started, &start_,
&ended, &end_);
}

/* The Gap Ack Block happens to end at the end of the
* overflow map.
*/
if (started && !ended) {
ended++;
_end = map->len + map->len - 1;
end_ = map->len + map->len - 1;
}

/* If we found a Gap Ack Block, return the start and end and
Expand All @@ -215,8 +215,8 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map,
int gap = map->cumulative_tsn_ack_point -
map->base_tsn;

*start = _start - gap;
*end = _end - gap;
*start = start_ - gap;
*end = end_ - gap;

/* Move the iterator forward. */
iter->start = map->cumulative_tsn_ack_point + *end + 1;
Expand Down

0 comments on commit cc121fa

Please sign in to comment.