diff options
author | Xin Long <lucien.xin@gmail.com> | 2017-07-22 21:34:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-24 19:01:20 -0400 |
commit | afd93b7be6e24731d82d9fd84b8a5ea73a68214b (patch) | |
tree | 38294db52f459ae44719231aacf8a260bde8f69d /net/sctp/outqueue.c | |
parent | 9b41515636563ae76e730dbcb97fd303b94ed7d9 (diff) |
sctp: remove the typedef sctp_sack_variable_t
This patch is to remove the typedef sctp_sack_variable_t, and
replace with union sctp_sack_variable in the places where it's
using this typedef.
It is also to fix some indents in sctp_acked().
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/outqueue.c')
-rw-r--r-- | net/sctp/outqueue.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index e8762702a313..d2a8adfd4a6f 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -1197,7 +1197,7 @@ sctp_flush_out: | |||
1197 | static void sctp_sack_update_unack_data(struct sctp_association *assoc, | 1197 | static void sctp_sack_update_unack_data(struct sctp_association *assoc, |
1198 | struct sctp_sackhdr *sack) | 1198 | struct sctp_sackhdr *sack) |
1199 | { | 1199 | { |
1200 | sctp_sack_variable_t *frags; | 1200 | union sctp_sack_variable *frags; |
1201 | __u16 unack_data; | 1201 | __u16 unack_data; |
1202 | int i; | 1202 | int i; |
1203 | 1203 | ||
@@ -1224,7 +1224,7 @@ int sctp_outq_sack(struct sctp_outq *q, struct sctp_chunk *chunk) | |||
1224 | struct sctp_transport *transport; | 1224 | struct sctp_transport *transport; |
1225 | struct sctp_chunk *tchunk = NULL; | 1225 | struct sctp_chunk *tchunk = NULL; |
1226 | struct list_head *lchunk, *transport_list, *temp; | 1226 | struct list_head *lchunk, *transport_list, *temp; |
1227 | sctp_sack_variable_t *frags = sack->variable; | 1227 | union sctp_sack_variable *frags = sack->variable; |
1228 | __u32 sack_ctsn, ctsn, tsn; | 1228 | __u32 sack_ctsn, ctsn, tsn; |
1229 | __u32 highest_tsn, highest_new_tsn; | 1229 | __u32 highest_tsn, highest_new_tsn; |
1230 | __u32 sack_a_rwnd; | 1230 | __u32 sack_a_rwnd; |
@@ -1736,10 +1736,10 @@ static void sctp_mark_missing(struct sctp_outq *q, | |||
1736 | /* Is the given TSN acked by this packet? */ | 1736 | /* Is the given TSN acked by this packet? */ |
1737 | static int sctp_acked(struct sctp_sackhdr *sack, __u32 tsn) | 1737 | static int sctp_acked(struct sctp_sackhdr *sack, __u32 tsn) |
1738 | { | 1738 | { |
1739 | int i; | ||
1740 | sctp_sack_variable_t *frags; | ||
1741 | __u16 tsn_offset, blocks; | ||
1742 | __u32 ctsn = ntohl(sack->cum_tsn_ack); | 1739 | __u32 ctsn = ntohl(sack->cum_tsn_ack); |
1740 | union sctp_sack_variable *frags; | ||
1741 | __u16 tsn_offset, blocks; | ||
1742 | int i; | ||
1743 | 1743 | ||
1744 | if (TSN_lte(tsn, ctsn)) | 1744 | if (TSN_lte(tsn, ctsn)) |
1745 | goto pass; | 1745 | goto pass; |