* [PATCH net-next] sctp: make sctp_addto_chunk_fixed local
@ 2014-01-10 6:31 Stephen Hemminger
2014-01-10 14:29 ` Neil Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephen Hemminger @ 2014-01-10 6:31 UTC (permalink / raw)
To: Vlad Yasevich, Neil Horman, David Miller; +Cc: netdev
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);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] sctp: make sctp_addto_chunk_fixed local
2014-01-10 6:31 [PATCH net-next] sctp: make sctp_addto_chunk_fixed local Stephen Hemminger
@ 2014-01-10 14:29 ` Neil Horman
2014-01-10 20:45 ` Sergei Shtylyov
2014-01-13 22:43 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Neil Horman @ 2014-01-10 14:29 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Vlad Yasevich, David Miller, netdev
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] sctp: make sctp_addto_chunk_fixed local
2014-01-10 6:31 [PATCH net-next] sctp: make sctp_addto_chunk_fixed local Stephen Hemminger
2014-01-10 14:29 ` Neil Horman
@ 2014-01-10 20:45 ` Sergei Shtylyov
2014-01-13 22:43 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2014-01-10 20:45 UTC (permalink / raw)
To: Stephen Hemminger, Vlad Yasevich, Neil Horman, David Miller; +Cc: netdev
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] sctp: make sctp_addto_chunk_fixed local
2014-01-10 6:31 [PATCH net-next] sctp: make sctp_addto_chunk_fixed local Stephen Hemminger
2014-01-10 14:29 ` Neil Horman
2014-01-10 20:45 ` Sergei Shtylyov
@ 2014-01-13 22:43 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-01-13 22:43 UTC (permalink / raw)
To: stephen; +Cc: vyasevich, nhorman, netdev
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-13 22:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-10 6:31 [PATCH net-next] sctp: make sctp_addto_chunk_fixed local Stephen Hemminger
2014-01-10 14:29 ` Neil Horman
2014-01-10 20:45 ` Sergei Shtylyov
2014-01-13 22:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).