Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c94bf86 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[SCTP]: Make sctp_addto_param() static. 



sctp_addto_param() can become static.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 464771fe

include/net/sctp/structs.h

+0 −1
Original line number Diff line number Diff line
@@ -731,7 +731,6 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, 
			  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_param(struct sctp_chunk *, int len, const void *data);

struct sctp_chunk *sctp_chunkify(struct sk_buff *,

				 const struct sctp_association *,

				 struct sock *);

net/sctp/sm_make_chunk.c

+20 −19
Original line number Diff line number Diff line
@@ -839,6 +839,26 @@ struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc, 
	return retval;

}



/* Append bytes to the end of a parameter.  Will panic if chunk is not big

 * enough.

 */

static void *sctp_addto_param(struct sctp_chunk *chunk, int len,

			      const void *data)

{

	void *target;

	int chunklen = ntohs(chunk->chunk_hdr->length);



	target = skb_put(chunk->skb, len);



	memcpy(target, data, len);



	/* Adjust the chunk length field.  */

	chunk->chunk_hdr->length = htons(chunklen + len);

	chunk->chunk_end = skb_tail_pointer(chunk->skb);



	return target;

}



/* Make an ABORT chunk with a PROTOCOL VIOLATION cause code. */

struct sctp_chunk *sctp_make_abort_violation(

	const struct sctp_association *asoc,
@@ -1146,25 +1166,6 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data) 
	return target;

}



/* Append bytes to the end of a parameter.  Will panic if chunk is not big

 * enough.

 */

void *sctp_addto_param(struct sctp_chunk *chunk, int len, const void *data)

{

	void *target;

	int chunklen = ntohs(chunk->chunk_hdr->length);



	target = skb_put(chunk->skb, len);



	memcpy(target, data, len);



	/* Adjust the chunk length field.  */

	chunk->chunk_hdr->length = htons(chunklen + len);

	chunk->chunk_end = skb_tail_pointer(chunk->skb);



	return target;

}



/* Append bytes from user space to the end of a chunk.  Will panic if

 * chunk is not big enough.

 * Returns a kernel err value.