From patchwork Fri Jan 10 06:31:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 309105 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4D9592C00AC for ; Fri, 10 Jan 2014 17:31:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753146AbaAJGbc (ORCPT ); Fri, 10 Jan 2014 01:31:32 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:40561 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752274AbaAJGbO (ORCPT ); Fri, 10 Jan 2014 01:31:14 -0500 Received: by mail-pa0-f53.google.com with SMTP id hz1so4318055pad.26 for ; Thu, 09 Jan 2014 22:31:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-type:content-transfer-encoding; bh=QArObX3tFX58ZfJnjOoDWgbDZYwof1L0JIZjpalVjzE=; b=X2LKR4vSltWyVUbqtufaDfqn8BrdzvUkSavu/vSh5j4LbeP+bUNf9j06e/RvsRAmPx 6aowncO2gQ4Nli7J7/gMh+iMe6XHJifMuMvh3AjlJ1anUsgsltonF4n9WaR+ZfFRvq4n GI0bq8qZFlMltuCOd+HXw17teYlPoHDFUFDMzrsF13jCja4mMhfKdf6Q6uYk4CJ0x3/a 62pk1fU0S+K3jtSrSVwWXVT49CexIRlAB1ltx9oU3uJgea8wQvSTxyUn+/B9XI+XGjAt gCYPcKZWBA3ymXDtEAHWfkIUZboTo0CIE6zo1OeDXWR29aKgBMV3hhlZ2+bjNKJsaaPY 422g== X-Gm-Message-State: ALoCoQnZI1pxtVVRiw0Fb2cGA49fK9CVEprkJfJfl8XivfO8b25+lWSDbe5jpdk8J4GnNMZvf+cS X-Received: by 10.68.197.66 with SMTP id is2mr9034465pbc.96.1389335473639; Thu, 09 Jan 2014 22:31:13 -0800 (PST) Received: from nehalam.linuxnetplumber.net (static-50-53-83-51.bvtn.or.frontiernet.net. [50.53.83.51]) by mx.google.com with ESMTPSA id e6sm14685154pbg.4.2014.01.09.22.31.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 Jan 2014 22:31:13 -0800 (PST) Date: Thu, 9 Jan 2014 22:31:11 -0800 From: Stephen Hemminger To: Vlad Yasevich , Neil Horman , David Miller Cc: netdev@vger.kernel.org Subject: [PATCH net-next] sctp: make sctp_addto_chunk_fixed local Message-ID: <20140109223111.71e55286@nehalam.linuxnetplumber.net> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger Acked-by: Neil Horman --- 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 --- 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);