summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Long <lucien.xin@gmail.com>2017-07-23 09:34:34 +0800
committerDavid S. Miller <davem@davemloft.net>2017-07-24 16:01:20 -0700
commit4d2dcdf4e04c938b266f06f271000e4b0f3a288f (patch)
treed49a0dbdbbbe4dae1c250c2a1c373ae9b7a49f86
parentd4d6c61489e7e4a8944360312e572988889558a8 (diff)
downloadlinux-4d2dcdf4e04c938b266f06f271000e4b0f3a288f.tar.gz
linux-4d2dcdf4e04c938b266f06f271000e4b0f3a288f.tar.bz2
linux-4d2dcdf4e04c938b266f06f271000e4b0f3a288f.zip
sctp: remove the typedef sctp_heartbeathdr_t
This patch is to remove the typedef sctp_heartbeathdr_t, and replace with struct sctp_heartbeathdr 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.h6
-rw-r--r--net/sctp/sm_statefuns.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 48f6560dd880..6e26b86770f1 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -394,13 +394,13 @@ struct sctp_sack_chunk {
* the present association.
*/
-typedef struct sctp_heartbeathdr {
+struct sctp_heartbeathdr {
struct sctp_paramhdr info;
-} sctp_heartbeathdr_t;
+};
typedef struct sctp_heartbeat_chunk {
struct sctp_chunkhdr chunk_hdr;
- sctp_heartbeathdr_t hb_hdr;
+ struct sctp_heartbeathdr hb_hdr;
} sctp_heartbeat_chunk_t;
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 08ebe8cd96c7..32ac90b22654 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1096,7 +1096,7 @@ sctp_disposition_t sctp_sf_beat_8_3(struct net *net,
* respond with a HEARTBEAT ACK that contains the Heartbeat
* Information field copied from the received HEARTBEAT chunk.
*/
- chunk->subh.hb_hdr = (sctp_heartbeathdr_t *)chunk->skb->data;
+ chunk->subh.hb_hdr = (struct sctp_heartbeathdr *)chunk->skb->data;
param_hdr = (struct sctp_paramhdr *)chunk->subh.hb_hdr;
paylen = ntohs(chunk->chunk_hdr->length) - sizeof(struct sctp_chunkhdr);