joel16/android_kernel_sony_msm8994_rework
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994_rework.git synced 2024-12-27 22:46:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sctp: fix shadow symbol in net/sctp/tsnmap.c

Browse Source 
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>
This commit is contained in:
Sebastian Siewior 2007-07-27 22:59:49 +02:00 committed by Vlad Yasevich
parent d6f9fdaf64
commit cc121fa87a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/sctp/tsnmap.c
View File

@ -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;
@ -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? */
@ -193,8 +193,8 @@ 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
@ -202,7 +202,7 @@ SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *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
@ -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;