Received: with ECARTIS (v1.0.0; list netdev); Fri, 06 May 2005 15:26:13 -0700 (PDT) Received: from mailout.stusta.mhn.de (mailout.stusta.mhn.de [141.84.69.5]) by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with SMTP id j46MQ9Ov018120 for ; Fri, 6 May 2005 15:26:10 -0700 Received: (qmail 12053 invoked from network); 6 May 2005 22:25:51 -0000 Received: from r063144.stusta.swh.mhn.de (10.150.63.144) by mailhub.stusta.mhn.de with SMTP; 6 May 2005 22:25:51 -0000 Received: by r063144.stusta.swh.mhn.de (Postfix, from userid 1000) id 06CDDBB4E8; Sat, 7 May 2005 00:25:50 +0200 (CEST) Date: Sat, 7 May 2005 00:25:50 +0200 From: Adrian Bunk To: sri@us.ibm.com Cc: lksctp-developers@lists.sourceforge.net, netdev@oss.sgi.com, linux-kernel@vger.kernel.org Subject: [2.6 patch] net/sctp/: make two functions static Message-ID: <20050506222549.GW3590@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.9i X-archive-position: 887 X-ecartis-version: Ecartis v1.0.0 Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com X-original-sender: bunk@stusta.de Precedence: bulk X-list: netdev Content-Length: 2491 Lines: 66 This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk --- include/net/sctp/sm.h | 3 --- net/sctp/sm_statefuns.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) --- linux-2.6.12-rc3-mm3-full/include/net/sctp/sm.h.old 2005-05-05 22:59:54.000000000 +0200 +++ linux-2.6.12-rc3-mm3-full/include/net/sctp/sm.h 2005-05-06 00:17:40.000000000 +0200 @@ -130,7 +130,6 @@ sctp_state_fn_t sctp_sf_ootb; sctp_state_fn_t sctp_sf_pdiscard; sctp_state_fn_t sctp_sf_violation; -sctp_state_fn_t sctp_sf_violation_chunklen; sctp_state_fn_t sctp_sf_discard_chunk; sctp_state_fn_t sctp_sf_do_5_2_1_siminit; sctp_state_fn_t sctp_sf_do_5_2_2_dupinit; @@ -258,8 +257,6 @@ void sctp_chunk_assign_tsn(struct sctp_chunk *); void sctp_chunk_assign_ssn(struct sctp_chunk *); -void sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, __u16 error); - /* Prototypes for statetable processing. */ int sctp_do_sm(sctp_event_t event_type, sctp_subtype_t subtype, --- linux-2.6.12-rc3-mm3-full/net/sctp/sm_statefuns.c.old 2005-05-05 23:00:12.000000000 +0200 +++ linux-2.6.12-rc3-mm3-full/net/sctp/sm_statefuns.c 2005-05-06 00:19:11.000000000 +0200 @@ -92,6 +92,14 @@ sctp_cmd_seq_t *commands); static struct sctp_sackhdr *sctp_sm_pull_sack(struct sctp_chunk *chunk); +static void sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, __u16 error); + +static sctp_disposition_t sctp_sf_violation_chunklen( + const struct sctp_endpoint *ep, + const struct sctp_association *asoc, + const sctp_subtype_t type, + void *arg, + sctp_cmd_seq_t *commands); /* Small helper function that checks if the chunk length * is of the appropriate length. The 'required_length' argument @@ -2318,7 +2326,7 @@ * * This is common code called by several sctp_sf_*_abort() functions above. */ -void sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, __u16 error) +static void sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, __u16 error) { sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, SCTP_STATE(SCTP_STATE_CLOSED)); @@ -3672,7 +3680,8 @@ * * Generate an ABORT chunk and terminate the association. */ -sctp_disposition_t sctp_sf_violation_chunklen(const struct sctp_endpoint *ep, +static sctp_disposition_t sctp_sf_violation_chunklen( + const struct sctp_endpoint *ep, const struct sctp_association *asoc, const sctp_subtype_t type, void *arg,