summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Long <lucien.xin@gmail.com>2017-07-23 09:34:35 +0800
committerDavid S. Miller <davem@davemloft.net>2017-07-24 16:01:20 -0700
commit38c00f7482281801d6f7fe410c7a4b61ae25218e (patch)
tree0f1ef17268b54eca8cae67a270c86ceb87e5782e
parent4d2dcdf4e04c938b266f06f271000e4b0f3a288f (diff)
downloadtalos-obmc-linux-38c00f7482281801d6f7fe410c7a4b61ae25218e.tar.gz
talos-obmc-linux-38c00f7482281801d6f7fe410c7a4b61ae25218e.zip
sctp: remove the typedef sctp_heartbeat_chunk_t
This patch is to remove the typedef sctp_heartbeat_chunk_t, and replace with struct sctp_heartbeat_chunk in the places where it's using this typedef. Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/sctp.h4
-rw-r--r--net/sctp/sm_statefuns.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 6e26b86770f1..bfda7c66960c 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -398,10 +398,10 @@ struct sctp_heartbeathdr {
struct sctp_paramhdr info;
};
-typedef struct sctp_heartbeat_chunk {
+struct sctp_heartbeat_chunk {
struct sctp_chunkhdr chunk_hdr;
struct sctp_heartbeathdr hb_hdr;
-} sctp_heartbeat_chunk_t;
+};
/* For the abort and shutdown ACK we must carry the init tag in the
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 32ac90b22654..7bbee085b476 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1088,7 +1088,8 @@ sctp_disposition_t sctp_sf_beat_8_3(struct net *net,
return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
/* Make sure that the HEARTBEAT chunk has a valid length. */
- if (!sctp_chunk_length_valid(chunk, sizeof(sctp_heartbeat_chunk_t)))
+ if (!sctp_chunk_length_valid(chunk,
+ sizeof(struct sctp_heartbeat_chunk)))
return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
commands);
OpenPOWER on IntegriCloud