Skip to content

Commit

Permalink
sctp: remove the typedef sctp_ecnehdr_t
Browse files Browse the repository at this point in the history
This patch is to remove the typedef sctp_ecnehdr_t, and
replace with struct sctp_ecnehdr 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 2a49321 commit 1fb6d83
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 @@ -519,13 +519,13 @@ enum sctp_error {
/* RFC 2960. Appendix A. Explicit Congestion Notification.
* Explicit Congestion Notification Echo (ECNE) (12)
*/
typedef struct sctp_ecnehdr {
struct sctp_ecnehdr {
__be32 lowest_tsn;
} sctp_ecnehdr_t;
};

typedef struct sctp_ecne_chunk {
struct sctp_chunkhdr chunk_hdr;
sctp_ecnehdr_t ence_hdr;
struct sctp_ecnehdr ence_hdr;
} sctp_ecne_chunk_t;

/* RFC 2960. Appendix A. Explicit Congestion Notification.
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 @@ -697,11 +697,11 @@ struct sctp_chunk *sctp_make_ecne(const struct sctp_association *asoc,
const __u32 lowest_tsn)
{
struct sctp_chunk *retval;
sctp_ecnehdr_t ecne;
struct sctp_ecnehdr ecne;

ecne.lowest_tsn = htonl(lowest_tsn);
retval = sctp_make_control(asoc, SCTP_CID_ECN_ECNE, 0,
sizeof(sctp_ecnehdr_t), GFP_ATOMIC);
sizeof(ecne), GFP_ATOMIC);
if (!retval)
goto nodata;
retval->subh.ecne_hdr =
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 @@ -2918,8 +2918,8 @@ sctp_disposition_t sctp_sf_do_ecne(struct net *net,
void *arg,
sctp_cmd_seq_t *commands)
{
sctp_ecnehdr_t *ecne;
struct sctp_chunk *chunk = arg;
struct sctp_ecnehdr *ecne;

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

ecne = (sctp_ecnehdr_t *) chunk->skb->data;
skb_pull(chunk->skb, sizeof(sctp_ecnehdr_t));
ecne = (struct sctp_ecnehdr *)chunk->skb->data;
skb_pull(chunk->skb, sizeof(*ecne));

/* If this is a newer ECNE than the last CWR packet we sent out */
sctp_add_cmd_sf(commands, SCTP_CMD_ECN_ECNE,
Expand Down

0 comments on commit 1fb6d83

Please sign in to comment.