aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2014-01-10 01:31:11 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-13 17:42:30 -0500
commit6daaf0de2f3170206f57e7881adfbd8682cdd7fb (patch)
tree66160bfbc486c44654acb541c5d35016738497ff
parent7614aba6a330a6c4937edc24fd4c6a935c1ae703 (diff)
sctp: make sctp_addto_chunk_fixed local
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sctp/structs.h1
-rw-r--r--net/sctp/sm_make_chunk.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index e9f732fda950..d992ca3145fe 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -649,7 +649,6 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len,
649 struct iovec *data); 649 struct iovec *data);
650void sctp_chunk_free(struct sctp_chunk *); 650void sctp_chunk_free(struct sctp_chunk *);
651void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); 651void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);
652void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len, const void *data);
653struct sctp_chunk *sctp_chunkify(struct sk_buff *, 652struct sctp_chunk *sctp_chunkify(struct sk_buff *,
654 const struct sctp_association *, 653 const struct sctp_association *,
655 struct sock *); 654 struct sock *);
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index e5f7cdb42a85..632090b961c3 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -78,6 +78,8 @@ static int sctp_process_param(struct sctp_association *asoc,
78 gfp_t gfp); 78 gfp_t gfp);
79static void *sctp_addto_param(struct sctp_chunk *chunk, int len, 79static void *sctp_addto_param(struct sctp_chunk *chunk, int len,
80 const void *data); 80 const void *data);
81static void *sctp_addto_chunk_fixed(struct sctp_chunk *, int len,
82 const void *data);
81 83
82/* Control chunk destructor */ 84/* Control chunk destructor */
83static void sctp_control_release_owner(struct sk_buff *skb) 85static void sctp_control_release_owner(struct sk_buff *skb)
@@ -1475,8 +1477,8 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data)
1475/* Append bytes to the end of a chunk. Returns NULL if there isn't sufficient 1477/* Append bytes to the end of a chunk. Returns NULL if there isn't sufficient
1476 * space in the chunk 1478 * space in the chunk
1477 */ 1479 */
1478void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk, 1480static void *sctp_addto_chunk_fixed(struct sctp_chunk *chunk,
1479 int len, const void *data) 1481 int len, const void *data)
1480{ 1482{
1481 if (skb_tailroom(chunk->skb) >= len) 1483 if (skb_tailroom(chunk->skb) >= len)
1482 return sctp_addto_chunk(chunk, len, data); 1484 return sctp_addto_chunk(chunk, len, data);