Skip to content

Commit

Permalink
sctp: remove the typedef sctp_cwrhdr_t
Browse files Browse the repository at this point in the history
This patch is to remove the typedef sctp_cwrhdr_t, and
replace with struct sctp_cwrhdr in the places where it's
using this typedef.

It is also to use sizeof(variable) instead of sizeof(type).

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Xin Long authored and David S. Miller committed Aug 3, 2017
1 parent b515fd2 commit 65f7710
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions include/linux/sctp.h
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,13 @@ struct sctp_ecne_chunk {
/* RFC 2960. Appendix A. Explicit Congestion Notification.
* Congestion Window Reduced (CWR) (13)
*/
typedef struct sctp_cwrhdr {
struct sctp_cwrhdr {
__be32 lowest_tsn;
} sctp_cwrhdr_t;
};

typedef struct sctp_cwr_chunk {
struct sctp_chunkhdr chunk_hdr;
sctp_cwrhdr_t cwr_hdr;
struct sctp_cwrhdr cwr_hdr;
} sctp_cwr_chunk_t;

/* PR-SCTP
Expand Down
4 changes: 2 additions & 2 deletions net/sctp/sm_make_chunk.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,11 +663,11 @@ struct sctp_chunk *sctp_make_cwr(const struct sctp_association *asoc,
const struct sctp_chunk *chunk)
{
struct sctp_chunk *retval;
sctp_cwrhdr_t cwr;
struct sctp_cwrhdr cwr;

cwr.lowest_tsn = htonl(lowest_tsn);
retval = sctp_make_control(asoc, SCTP_CID_ECN_CWR, 0,
sizeof(sctp_cwrhdr_t), GFP_ATOMIC);
sizeof(cwr), GFP_ATOMIC);

if (!retval)
goto nodata;
Expand Down
6 changes: 3 additions & 3 deletions net/sctp/sm_statefuns.c
Original file line number Diff line number Diff line change
Expand Up @@ -2862,8 +2862,8 @@ sctp_disposition_t sctp_sf_do_ecn_cwr(struct net *net,
void *arg,
sctp_cmd_seq_t *commands)
{
sctp_cwrhdr_t *cwr;
struct sctp_chunk *chunk = arg;
struct sctp_cwrhdr *cwr;
u32 lowest_tsn;

if (!sctp_vtag_verify(chunk, asoc))
Expand All @@ -2873,8 +2873,8 @@ sctp_disposition_t sctp_sf_do_ecn_cwr(struct net *net,
return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
commands);

cwr = (sctp_cwrhdr_t *) chunk->skb->data;
skb_pull(chunk->skb, sizeof(sctp_cwrhdr_t));
cwr = (struct sctp_cwrhdr *)chunk->skb->data;
skb_pull(chunk->skb, sizeof(*cwr));

lowest_tsn = ntohl(cwr->lowest_tsn);

Expand Down

0 comments on commit 65f7710

Please sign in to comment.