| Message ID | 20140109223111.71e55286@nehalam.linuxnetplumber.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jan 09, 2014 at 10:31:11PM -0800, Stephen Hemminger wrote: > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > --- > include/net/sctp/structs.h | 1 - > net/sctp/sm_make_chunk.c | 6 ++++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > --- a/include/net/sctp/structs.h 2014-01-09 22:29:51.871663405 -0800 > +++ b/include/net/sctp/structs.h 2014-01-09 22:29:58.323581984 -0800 > @@ -649,7 +649,6 @@ int sctp_user_addto_chunk(struct sctp_ch > struct iovec *data); > void sctp_chunk_free(struct sctp_chunk *); > void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); > -void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, const void *data); > struct sctp_chunk *sctp_chunkify(struct sk_buff *, > const struct sctp_association *, > struct sock *); > --- a/net/sctp/sm_make_chunk.c 2014-01-09 22:29:51.871663405 -0800 > +++ b/net/sctp/sm_make_chunk.c 2014-01-09 22:29:58.323581984 -0800 > @@ -78,6 +78,8 @@ static int sctp_process_param(struct sct > gfp_t gfp); > static void *sctp_addto_param(struct sctp_chunk *chunk, int len, > const void *data); > +static void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, > + const void *data); > > /* Control chunk destructor */ > static void sctp_control_release_owner(struct sk_buff *skb) > @@ -1475,8 +1477,8 @@ void *sctp_addto_chunk(struct sctp_chunk > /* Append bytes to the end of a chunk. Returns NULL if there isn't sufficient > * space in the chunk > */ > -void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk, > - int len, const void *data) > +static void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk, > + int len, const void *data) > { > if (skb_tailroom(chunk->skb) >= len) > return sctp_addto_chunk(chunk, len, data); > Acked-by: Neil Horman <nhorman@tuxdriver.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 01/10/2014 09:31 AM, Stephen Hemminger wrote: > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> [...] > --- a/net/sctp/sm_make_chunk.c 2014-01-09 22:29:51.871663405 -0800 > +++ b/net/sctp/sm_make_chunk.c 2014-01-09 22:29:58.323581984 -0800 > @@ -78,6 +78,8 @@ static int sctp_process_param(struct sct > gfp_t gfp); > static void *sctp_addto_param(struct sctp_chunk *chunk, int len, > const void *data); > +static void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, Sorry for nitpicking but two spaces after 'void' don't align well with the previous declaration. Probably can be fixed while applying... > + const void *data); > > /* Control chunk destructor */ > static void sctp_control_release_owner(struct sk_buff *skb) WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stephen Hemminger <stephen@networkplumber.org> Date: Thu, 9 Jan 2014 22:31:11 -0800 > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Applied, thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/include/net/sctp/structs.h 2014-01-09 22:29:51.871663405 -0800 +++ b/include/net/sctp/structs.h 2014-01-09 22:29:58.323581984 -0800 @@ -649,7 +649,6 @@ int sctp_user_addto_chunk(struct sctp_ch struct iovec *data); void sctp_chunk_free(struct sctp_chunk *); void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); -void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, const void *data); struct sctp_chunk *sctp_chunkify(struct sk_buff *, const struct sctp_association *, struct sock *); --- a/net/sctp/sm_make_chunk.c 2014-01-09 22:29:51.871663405 -0800 +++ b/net/sctp/sm_make_chunk.c 2014-01-09 22:29:58.323581984 -0800 @@ -78,6 +78,8 @@ static int sctp_process_param(struct sct gfp_t gfp); static void *sctp_addto_param(struct sctp_chunk *chunk, int len, const void *data); +static void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, + const void *data); /* Control chunk destructor */ static void sctp_control_release_owner(struct sk_buff *skb) @@ -1475,8 +1477,8 @@ void *sctp_addto_chunk(struct sctp_chunk /* Append bytes to the end of a chunk. Returns NULL if there isn't sufficient * space in the chunk */ -void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk, - int len, const void *data) +static void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk, + int len, const void *data) { if (skb_tailroom(chunk->skb) >= len) return sctp_addto_chunk(chunk, len, data);
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- include/net/sctp/structs.h | 1 - net/sctp/sm_make_chunk.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html