GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-06 06:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sctp: remove the typedef sctp_shutdownhdr_t

Browse source 
This patch is to remove the typedef sctp_shutdownhdr_t, and
replace with struct sctp_shutdownhdr 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>
This commit is contained in:
Xin Long 2017-08-03 15:42:09 +08:00 • committed by David S. Miller
parent ddb0804206
commit e61e4055b1
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/sctp.h
View file

@ -416,13 +416,13 @@ struct sctp_abort_chunk {
/* For the graceful shutdown we must carry the tag (in common header) /* For the graceful shutdown we must carry the tag (in common header)
* and the highest consecutive acking value. * and the highest consecutive acking value.
*/ */
typedef struct sctp_shutdownhdr { struct sctp_shutdownhdr {
__be32 cum_tsn_ack; __be32 cum_tsn_ack;
} sctp_shutdownhdr_t; };
struct sctp_shutdown_chunk_t { struct sctp_shutdown_chunk_t {
struct sctp_chunkhdr chunk_hdr; struct sctp_chunkhdr chunk_hdr;
sctp_shutdownhdr_t shutdown_hdr; struct sctp_shutdownhdr shutdown_hdr;
}; };
/* RFC 2960. Section 3.3.10 Operation Error (ERROR) (9) */ /* RFC 2960. Section 3.3.10 Operation Error (ERROR) (9) */

4
net/sctp/sm_make_chunk.c
View file

@ -857,15 +857,15 @@ nodata:
struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc, struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,
const struct sctp_chunk *chunk) const struct sctp_chunk *chunk)
{ {
struct sctp_shutdownhdr shut;
struct sctp_chunk *retval; struct sctp_chunk *retval;
sctp_shutdownhdr_t shut;
__u32 ctsn; __u32 ctsn;
ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map); ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
shut.cum_tsn_ack = htonl(ctsn); shut.cum_tsn_ack = htonl(ctsn);
retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0, retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,
sizeof(sctp_shutdownhdr_t), GFP_ATOMIC); sizeof(shut), GFP_ATOMIC);
if (!retval) if (!retval)
goto nodata; goto nodata;

10
net/sctp/sm_statefuns.c
View file

@ -2656,8 +2656,8 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net,
sctp_cmd_seq_t *commands) sctp_cmd_seq_t *commands)
{ {
struct sctp_chunk *chunk = arg; struct sctp_chunk *chunk = arg;
sctp_shutdownhdr_t *sdh;
sctp_disposition_t disposition; sctp_disposition_t disposition;
struct sctp_shutdownhdr *sdh;
struct sctp_ulpevent *ev; struct sctp_ulpevent *ev;
__u32 ctsn; __u32 ctsn;
@ -2671,8 +2671,8 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net,
commands); commands);
/* Convert the elaborate header. */ /* Convert the elaborate header. */
sdh = (sctp_shutdownhdr_t *)chunk->skb->data; sdh = (struct sctp_shutdownhdr *)chunk->skb->data;
skb_pull(chunk->skb, sizeof(sctp_shutdownhdr_t)); skb_pull(chunk->skb, sizeof(*sdh));
chunk->subh.shutdown_hdr = sdh; chunk->subh.shutdown_hdr = sdh;
ctsn = ntohl(sdh->cum_tsn_ack); ctsn = ntohl(sdh->cum_tsn_ack);
@ -2746,7 +2746,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net,
sctp_cmd_seq_t *commands) sctp_cmd_seq_t *commands)
{ {
struct sctp_chunk *chunk = arg; struct sctp_chunk *chunk = arg;
sctp_shutdownhdr_t *sdh; struct sctp_shutdownhdr *sdh;
__u32 ctsn; __u32 ctsn;
if (!sctp_vtag_verify(chunk, asoc)) if (!sctp_vtag_verify(chunk, asoc))
@ -2758,7 +2758,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net,
return sctp_sf_violation_chunklen(net, ep, asoc, type, arg, return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
commands); commands);
sdh = (sctp_shutdownhdr_t *)chunk->skb->data; sdh = (struct sctp_shutdownhdr *)chunk->skb->data;
ctsn = ntohl(sdh->cum_tsn_ack); ctsn = ntohl(sdh->cum_tsn_ack);
if (TSN_lt(ctsn, asoc->ctsn_ack_point)) { if (TSN_lt(ctsn, asoc->ctsn_ack_point)) {