| Message ID | 5f8a7d818b5db99f2ff2a791a451b311c09fad7f.1484334002.git.lucien.xin@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Xin Long <lucien.xin@gmail.com> Date: Sat, 14 Jan 2017 03:15:35 +0800 > diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c > index a15d824..fd58097 100644 > --- a/net/sctp/sm_make_chunk.c > +++ b/net/sctp/sm_make_chunk.c > @@ -3526,3 +3526,36 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, > > return retval; > } > + > +/* RE-CONFIG 3.1 (RE-CONFIG chunk) > + * 0 1 2 3 > + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 > + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ > + * | Type = 130 | Chunk Flags | Chunk Length | > + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ > + * \ \ > + * / Re-configuration Parameter / > + * \ \ > + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ > + * \ \ > + * / Re-configuration Parameter (optional) / > + * \ \ > + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ > + */ > +static struct sctp_chunk *sctp_make_reconf( > + const struct sctp_association *asoc, > + int length) > +{ > + struct sctp_reconf_chunk *reconf; This patch will cause a warning because this new static function is unused. All patch series must be fully bisectable, that measn at each step of the patch series the tree must work properly and not introduce new build warnings or build failures.
On Tue, Jan 17, 2017 at 2:50 AM, David Miller <davem@davemloft.net> wrote: > From: Xin Long <lucien.xin@gmail.com> > Date: Sat, 14 Jan 2017 03:15:35 +0800 > >> diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c >> index a15d824..fd58097 100644 >> --- a/net/sctp/sm_make_chunk.c >> +++ b/net/sctp/sm_make_chunk.c >> @@ -3526,3 +3526,36 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, >> >> return retval; >> } >> + >> +/* RE-CONFIG 3.1 (RE-CONFIG chunk) >> + * 0 1 2 3 >> + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 >> + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ >> + * | Type = 130 | Chunk Flags | Chunk Length | >> + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ >> + * \ \ >> + * / Re-configuration Parameter / >> + * \ \ >> + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ >> + * \ \ >> + * / Re-configuration Parameter (optional) / >> + * \ \ >> + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ >> + */ >> +static struct sctp_chunk *sctp_make_reconf( >> + const struct sctp_association *asoc, >> + int length) >> +{ >> + struct sctp_reconf_chunk *reconf; > > This patch will cause a warning because this new static function is unused. > > All patch series must be fully bisectable, that measn at each step of > the patch series the tree must work properly and not introduce new > build warnings or build failures. sorry, will merge patch 1/7 and 2/7
diff --git a/include/linux/sctp.h b/include/linux/sctp.h index fcb4c36..cdc3b05 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -108,6 +108,7 @@ typedef enum { /* Use hex, as defined in ADDIP sec. 3.1 */ SCTP_CID_ASCONF = 0xC1, SCTP_CID_ASCONF_ACK = 0x80, + SCTP_CID_RECONF = 0x82, } sctp_cid_t; /* enum */ @@ -710,4 +711,9 @@ struct sctp_infox { struct sctp_association *asoc; }; +struct sctp_reconf_chunk { + sctp_chunkhdr_t chunk_hdr; + __u8 params[0]; +} __packed; + #endif /* __LINUX_SCTP_H__ */ diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index a15d824..fd58097 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -3526,3 +3526,36 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, return retval; } + +/* RE-CONFIG 3.1 (RE-CONFIG chunk) + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Type = 130 | Chunk Flags | Chunk Length | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * \ \ + * / Re-configuration Parameter / + * \ \ + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * \ \ + * / Re-configuration Parameter (optional) / + * \ \ + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +static struct sctp_chunk *sctp_make_reconf( + const struct sctp_association *asoc, + int length) +{ + struct sctp_reconf_chunk *reconf; + struct sctp_chunk *retval; + + retval = sctp_make_control(asoc, SCTP_CID_RECONF, 0, length, + GFP_ATOMIC); + if (!retval) + return NULL; + + reconf = (struct sctp_reconf_chunk *)retval->chunk_hdr; + retval->param_hdr.v = reconf->params; + + return retval; +}
This patch is to define a common api used to alloc memory and initialize reconf chunk header that described in rfc6525 section 3.1. All reconf chunks will be generated by calling this helper function. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- include/linux/sctp.h | 6 ++++++ net/sctp/sm_make_chunk.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)