[SCTP]: Rename sctp_foo.[ch] to foo.[ch] and kill CVS tags on authors request.

include/linux/sctp.h

@@ -8,8 +8,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/linux/sctp.h,v 1.7 2002/07/17 16:13:50 jgrimm Exp $
- * 
  * Various protocol defined structures.  
  * 
  * The SCTP reference implementation is free software; 

include/net/sctp/sctp_command.h → include/net/sctp/command.h

@@ -3,8 +3,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_command.h,v 1.19 2002/08/16 19:30:49 jgrimm Exp $
- * 
  * These are the definitions needed for the command object.
  * 
  * The SCTP reference implementation  is free software; 
@@ -38,8 +36,8 @@
 #ifndef __net_sctp_command_h__
 #define __net_sctp_command_h__
 
-#include <net/sctp/sctp_constants.h>
-#include <net/sctp/sctp_structs.h>
+#include <net/sctp/constants.h>
+#include <net/sctp/structs.h>
 
 
 typedef enum {

include/net/sctp/sctp_constants.h → include/net/sctp/constants.h

@@ -10,9 +10,6 @@
  * based on <draft-ietf-tsvwg-addip-sctp-02.txt> June 29, 2001,
  * for the SCTP kernel reference Implementation.
  * 
- * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_constants.h,v 1.11 2002/07/26 22:52:32 jgrimm Exp $
- * 
  * The SCTP reference implementation  is free software; 
  * you can redistribute it and/or modify it under the terms of 
  * the GNU General Public License as published by
@@ -57,7 +54,7 @@
 #include <linux/tcp.h>  /* For TCP states used in sctp_sock_state_t */
 #include <linux/sctp.h>
 #include <linux/ipv6.h> /* For ipv6hdr. */
-#include <net/sctp/sctp_user.h>
+#include <net/sctp/user.h>
 
 /* What a hack!  Jiminy Cricket!  */
 enum { SCTP_MAX_STREAM = 10 };

include/net/sctp/sctp.h

@@ -6,8 +6,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Id: sctp.h,v 1.40 2002/08/21 18:34:03 jgrimm Exp $
- * 
  * The base lksctp header. 
  * 
  * The SCTP reference implementation is free software; 
@@ -85,9 +83,9 @@
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <net/sock.h>
-#include <net/sctp/sctp_structs.h>
-#include <net/sctp/sctp_constants.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/structs.h>
+#include <net/sctp/constants.h>
+#include <net/sctp/sm.h>
 
 
 /* Set SCTP_DEBUG flag via config if not already set. */

include/net/sctp/sctp_sm.h → include/net/sctp/sm.h

@@ -10,8 +10,6 @@
  * based on <draft-ietf-tsvwg-addip-sctp-02.txt> June 29, 2001,
  * for the SCTP kernel reference Implementation.
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_sm.h,v 1.34 2002/08/21 18:34:04 jgrimm Exp $
- * 
  * These are definitions needed by the state machine.
  * 
  * The SCTP reference implementation is free software; 
@@ -57,7 +55,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/in.h>
-#include <net/sctp/sctp_command.h>
+#include <net/sctp/command.h>
 #include <net/sctp/sctp.h>
 
 #ifndef __sctp_sm_h__

include/net/sctp/sctp_structs.h → include/net/sctp/structs.h

@@ -6,8 +6,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_structs.h,v 1.21 2002/08/16 19:30:49 jgrimm Exp $
- * 
  * The SCTP reference implementation is free software; 
  * you can redistribute it and/or modify it under the terms of 
  * the GNU General Public License as published by
@@ -130,9 +128,9 @@ typedef struct SCTP_bind_addr sctp_bind_addr_t;
 typedef struct sctp_opt sctp_opt_t;
 typedef struct sctp_endpoint_common sctp_endpoint_common_t;
 
-#include <net/sctp/sctp_tsnmap.h>
-#include <net/sctp/sctp_ulpevent.h>
-#include <net/sctp/sctp_ulpqueue.h>
+#include <net/sctp/tsnmap.h>
+#include <net/sctp/ulpevent.h>
+#include <net/sctp/ulpqueue.h>
 
 
 /* Structures useful for managing bind/connect. */

include/net/sctp/sctp_tsnmap.h → include/net/sctp/tsnmap.h

@@ -3,8 +3,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_tsnmap.h,v 1.8 2002/07/16 14:51:58 jgrimm Exp $
- * 
  * These are the definitions needed for the tsnmap type.  The tsnmap is used
  * to track out of order TSNs received.
  * 
@@ -35,7 +33,7 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-#include <net/sctp/sctp_constants.h>
+#include <net/sctp/constants.h>
 
 #ifndef __sctp_tsnmap_h__
 #define __sctp_tsnmap_h__

include/net/sctp/sctp_ulpevent.h → include/net/sctp/ulpevent.h

@@ -6,8 +6,6 @@
  * Copyright (c) 2001 Nokia, Inc.
  * Copyright (c) 2001 La Monte H.P. Yarroll
  *
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_ulpevent.h,v 1.5 2002/07/12 14:50:25 jgrimm Exp $
- * 
  * These are the definitions needed for the sctp_ulpevent type.  The 
  * sctp_ulpevent type is used to carry information from the state machine
  * upwards to the ULP. 

include/net/sctp/sctp_ulpqueue.h → include/net/sctp/ulpqueue.h

@@ -5,8 +5,6 @@
  * Copyright (c) 2001 Intel Corp.
  * Copyright (c) 2001 Nokia, Inc.
  * Copyright (c) 2001 La Monte H.P. Yarroll
- *
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_ulpqueue.h,v 1.2 2002/07/12 14:50:25 jgrimm Exp $
  * 
  * These are the definitions needed for the sctp_ulpqueue type.  The 
  * sctp_ulpqueue is the interface between the Upper Layer Protocol, or ULP,

include/net/sctp/sctp_user.h → include/net/sctp/user.h

@@ -5,8 +5,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/include/net/sctp/sctp_user.h,v 1.17 2002/07/29 21:04:23 jgrimm Exp $
- * 
  * This header represents the structures and constants needed to support
  * the SCTP Extension to the Sockets API. 
  * 

net/sctp/Makefile

@@ -4,24 +4,24 @@
 
 obj-$(CONFIG_IP_SCTP) += sctp.o
 
-sctp-y := sctp_sm_statetable.o sctp_sm_statefuns.o sctp_sm_sideeffect.o \
-	  sctp_protocol.o sctp_endpointola.o sctp_associola.o \
-	  sctp_transport.o sctp_sm_make_chunk.o sctp_ulpevent.o \
-	  sctp_inqueue.o sctp_outqueue.o sctp_ulpqueue.o sctp_command.o \
-	  sctp_tsnmap.o sctp_bind_addr.o sctp_socket.o sctp_primitive.o \
-	  sctp_output.o sctp_input.o sctp_hashdriver.o sctp_sla1.o \
-	  sctp_debug.o
+sctp-y := sm_statetable.o sm_statefuns.o sm_sideeffect.o \
+	  protocol.o endpointola.o associola.o \
+	  transport.o sm_make_chunk.o ulpevent.o \
+	  inqueue.o outqueue.o ulpqueue.o command.o \
+	  tsnmap.o bind_addr.o socket.o primitive.o \
+	  output.o input.o hashdriver.o sla1.o \
+	  debug.o
 
 ifeq ($(CONFIG_SCTP_ADLER32), y)
-sctp-y += sctp_adler32.o
+sctp-y += adler32.o
 else
-sctp-y += sctp_crc32c.o
+sctp-y += crc32c.o
 endif
 
-sctp-$(CONFIG_SCTP_DBG_OBJCNT) += sctp_objcnt.o
-sctp-$(CONFIG_SYSCTL) += sctp_sysctl.o
+sctp-$(CONFIG_SCTP_DBG_OBJCNT) += objcnt.o
+sctp-$(CONFIG_SYSCTL) += sysctl.o
 
-sctp-$(subst m,y,$(CONFIG_IPV6))	+= sctp_ipv6.o
+sctp-$(subst m,y,$(CONFIG_IPV6))	+= ipv6.o
 
 sctp-objs := $(sctp-y)
 

net/sctp/sctp_adler32.c → net/sctp/adler32.c

@@ -4,8 +4,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_adler32.c,v 1.5 2002/06/13 16:03:38 jgrimm Exp $
- * 
  * This file has direct heritage from the SCTP user-level reference 
  * implementation by R. Stewart, et al.  These functions implement the
  * Adler-32 algorithm as specified by RFC 2960. 
@@ -42,7 +40,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_adler32.c,v 1.5 2002/06/13 16:03:38 jgrimm Exp $";
 
 /* This is an entry point for external calls
  * Define this function in the header file. This is
@@ -139,7 +136,8 @@ __u32 count_crc(__u8 *ptr, __u16 count)
 	adler = update_adler32(adler, ptr, 
 			       sizeof(struct sctphdr) - sizeof(__u32));
 	/* Skip over the checksum field. */
-	adler = update_adler32(adler, &zero, sizeof(__u32));
+	adler = update_adler32(adler, (unsigned char *) &zero,
+			       sizeof(__u32));
 	ptr += sizeof(struct sctphdr);
 	count -= sizeof(struct sctphdr);
 

net/sctp/sctp_associola.c → net/sctp/associola.c

@@ -7,8 +7,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_associola.c,v 1.48 2002/08/16 19:30:49 jgrimm Exp $
- * 
  * This module provides the abstraction for an SCTP association.
  * 
  * The SCTP reference implementation is free software; 
@@ -47,7 +45,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_associola.c,v 1.48 2002/08/16 19:30:49 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/fcntl.h>

net/sctp/sctp_bind_addr.c → net/sctp/bind_addr.c

@@ -6,8 +6,6 @@
  *
  * This file is part of the SCTP kernel reference implementation.
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_bind_addr.c,v 1.16 2002/07/12 15:15:45 jgrimm Exp $
- * 
  * A collection class to handle the storage of transport addresses. 
  * 
  * The SCTP reference implementation is free software; 
@@ -44,8 +42,6 @@
  * be incorporated into the next SCTP release.
  */
 
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_bind_addr.c,v 1.16 2002/07/12 15:15:45 jgrimm Exp $";
-
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/in.h>
@@ -53,7 +49,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_bind_addr.c,v 1.16 200
 #include <net/ipv6.h>
 #include <net/if_inet6.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Forward declarations for internal helpers. */
 static int sctp_copy_one_addr(sctp_bind_addr_t *, sockaddr_storage_t *,

net/sctp/sctp_command.c → net/sctp/command.c

@@ -4,8 +4,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_command.c,v 1.4 2002/04/24 16:33:39 jgrimm Exp $
- * 
  * These functions manipulate sctp command sequences.
  * 
  * The SCTP reference implementation is free software; 
@@ -40,11 +38,9 @@
  * be incorporated into the next SCTP release.
  */
 
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_command.c,v 1.4 2002/04/24 16:33:39 jgrimm Exp $";
-
 #include <linux/types.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Create a new sctp_command_sequence.  */
 sctp_cmd_seq_t *sctp_new_cmd_seq(int priority)

net/sctp/sctp_crc32c.c → net/sctp/crc32c.c

@@ -4,8 +4,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_crc32c.c,v 1.9 2002/07/12 14:50:25 jgrimm Exp $
- * 
  * SCTP Checksum functions
  * 
  * The SCTP reference implementation is free software; 
@@ -39,7 +37,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_crc32c.c,v 1.9 2002/07/12 14:50:25 jgrimm Exp $";
 
 /* The following code has been taken directly from
  * draft-ietf-tsvwg-sctpcsum-03.txt

net/sctp/sctp_debug.c → net/sctp/debug.c

@@ -10,8 +10,6 @@
  * based on <draft-ietf-tsvwg-addip-sctp-02.txt> June 29, 2001,
  * for the SCTP kernel reference Implementation.
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_debug.c,v 1.10 2002/07/12 14:50:25 jgrimm Exp $
- * 
  * This file converts numerical ID value to alphabetical names for SCTP
  * terms such as chunk type, parameter time, event type, etc.
  * 
@@ -49,7 +47,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_debug.c,v 1.10 2002/07/12 14:50:25 jgrimm Exp $";
 
 #include <net/sctp/sctp.h>
 

net/sctp/sctp_endpointola.c → net/sctp/endpointola.c

@@ -8,8 +8,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_endpointola.c,v 1.26 2002/08/16 19:30:49 jgrimm Exp $
- * 
  * This abstraction represents an SCTP endpoint.   
  *
  * This file is part of the implementation of the add-IP extension,
@@ -50,7 +48,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_endpointola.c,v 1.26 2002/08/16 19:30:49 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/sched.h>
@@ -60,7 +57,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_endpointola.c,v 1.26 2
 #include <net/sock.h>
 #include <net/ipv6.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Forward declarations for internal helpers. */
 static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep);

net/sctp/sctp_hashdriver.c → net/sctp/hashdriver.c

@@ -37,12 +37,11 @@
  * There are still LOTS of bugs in this code... I always run on the motto
  * "it is a wonder any code ever works :)"
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_hashdriver.c,v 1.2 2002/07/19 22:00:33 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <asm/string.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sla1.h>
+#include <net/sctp/sla1.h>
 
 /* SCTP Main driver.
  * passing a two pointers and two lengths,

net/sctp/sctp_input.c → net/sctp/input.c

@@ -8,8 +8,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_input.c,v 1.24 2002/07/24 12:26:20 jgrimm Exp $
- *
  * These functions handle all input from the IP layer into SCTP. 
  * 
  * The SCTP reference implementation is free software; 
@@ -47,7 +45,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_input.c,v 1.24 2002/07/24 12:26:20 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/list.h> /* For struct list_head */
@@ -57,7 +54,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_input.c,v 1.24 2002/07
 #include <net/sock.h>
 #include <linux/ipsec.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Forward declarations for internal helpers. */
 static int sctp_rcv_ootb(struct sk_buff *); 

net/sctp/sctp_inqueue.c → net/sctp/inqueue.c

@@ -5,8 +5,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_inqueue.c,v 1.10 2002/05/20 22:05:54 jgrimm Exp $
- * 
  * These functions are the methods for accessing the SCTP inqueue.
  *
  * An SCTP inqueue is a queue into which you push SCTP packets
@@ -44,10 +42,9 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_inqueue.c,v 1.10 2002/05/20 22:05:54 jgrimm Exp $";
 
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 #include <linux/interrupt.h>
 
 /* Initialize an SCTP_inqueue.  */

net/sctp/sctp_ipv6.c → net/sctp/ipv6.c

@@ -5,8 +5,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_ipv6.c,v 1.12 2002/08/16 19:30:49 jgrimm Exp $
- * 
  * SCTP over IPv6.
  * 
  * The SCTP reference implementation is free software; 
@@ -46,7 +44,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_ipv6.c,v 1.12 2002/08/16 19:30:49 jgrimm Exp $";
 
 #define __NO_VERSION__
 #include <linux/module.h>
@@ -76,7 +73,6 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_ipv6.c,v 1.12 2002/08/
 #include <net/inet_common.h>
 #include <net/inet_ecn.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp.h>
 
 #include <asm/uaccess.h>
 

net/sctp/sctp_objcnt.c → net/sctp/objcnt.c

@@ -3,8 +3,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_objcnt.c,v 1.5 2002/07/12 14:50:25 jgrimm Exp $
- * 
  * Support for memory object debugging.  This allows one to monitor the
  * object allocations/deallocations for types instrumented for this 
  * via the proc fs. 
@@ -39,7 +37,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_objcnt.c,v 1.5 2002/07/12 14:50:25 jgrimm Exp $";
 
 #include <net/sctp/sctp.h>
 

net/sctp/sctp_output.c → net/sctp/output.c

@@ -5,8 +5,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_output.c,v 1.22 2002/07/12 14:39:05 jgrimm Exp $
- * 
  * These functions handle output processing.
  *  
  * The SCTP reference implementation is free software; 
@@ -42,7 +40,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_output.c,v 1.22 2002/07/12 14:39:05 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -63,7 +60,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_output.c,v 1.22 2002/0
 #include <net/sock.h>
 
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Forward declarations for private helpers. */
 __u32 count_crc(__u8 *ptr, __u16  count);

net/sctp/sctp_outqueue.c → net/sctp/outqueue.c

@@ -6,8 +6,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_outqueue.c,v 1.35 2002/08/05 02:58:05 jgrimm Exp $
- * 
  * These functions implement the outqueue class.   The outqueue handles
  * bundling and queueing of outgoing SCTP chunks.  
  * 
@@ -47,7 +45,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_outqueue.c,v 1.35 2002/08/05 02:58:05 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/list.h> /* For struct list_head */
@@ -271,9 +268,10 @@ void sctp_retransmit(sctp_outqueue_t *q, sctp_transport_t *transport,
 	while (NULL != (lchunk = sctp_list_dequeue(&tlist)))
 		list_add_tail(lchunk, &transport->transmitted);
 
-	SCTP_DEBUG_PRINTK(__FUNCTION__": transport: %p, fast_retransmit: %d, "
+	SCTP_DEBUG_PRINTK("%s: transport: %p, fast_retransmit: %d, "
 			  "cwnd: %d, ssthresh: %d, flight_size: %d, "
-			  "pba: %d\n",transport, fast_retransmit,
+			  "pba: %d\n", __FUNCTION__,
+			  transport, fast_retransmit,
 			  transport->cwnd, transport->ssthresh,
 			  transport->flight_size,
 			  transport->partial_bytes_acked);
@@ -987,10 +985,11 @@ int sctp_sack_outqueue(sctp_outqueue_t *q, sctp_sackhdr_t *sack)
 
 	ctsn = q->asoc->ctsn_ack_point;
 
-	SCTP_DEBUG_PRINTK(__FUNCTION__ ": sack Cumulative TSN Ack is 0x%x.\n",
+	SCTP_DEBUG_PRINTK("%s: sack Cumulative TSN Ack is 0x%x.\n",
+			  __FUNCTION__,
 			  sack_ctsn);
-	SCTP_DEBUG_PRINTK(__FUNCTION__ ": Cumulative TSN Ack of association "
-			  "%p is 0x%x.\n",q->asoc, ctsn);
+	SCTP_DEBUG_PRINTK("%s: Cumulative TSN Ack of association "
+			  "%p is 0x%x.\n", __FUNCTION__, q->asoc, ctsn);
 
 	/* Throw away stuff rotting on the sack queue.  */
 	list_for_each(lchunk, &q->sacked) {
@@ -1218,9 +1217,10 @@ static void sctp_check_transmitted(sctp_outqueue_t *q,
 
 		} else {
 			if (tchunk->tsn_gap_acked) {
-				SCTP_DEBUG_PRINTK(__FUNCTION__
-						  ": Receiver reneged on data "
-						  "TSN: 0x%x\n", tsn);
+				SCTP_DEBUG_PRINTK("%s: Receiver reneged on data "
+						  "TSN: 0x%x\n",
+						  __FUNCTION__,
+						  tsn);
 				tchunk->tsn_gap_acked = 0;
 
 				bytes_acked -= sctp_data_size(tchunk);
@@ -1396,8 +1396,9 @@ static void sctp_check_transmitted(sctp_outqueue_t *q,
 		if (do_fast_retransmit)
 			sctp_retransmit(q, transport, do_fast_retransmit);
 
-		SCTP_DEBUG_PRINTK(__FUNCTION__ ": transport: %p, cwnd: %d, "
+		SCTP_DEBUG_PRINTK("%s: transport: %p, cwnd: %d, "
 				  "ssthresh: %d, flight_size: %d, pba: %d\n",
+				  __FUNCTION__,
 			  	  transport, transport->cwnd,
 			  	  transport->ssthresh, transport->flight_size,
 				  transport->partial_bytes_acked);

net/sctp/sctp_primitive.c → net/sctp/primitive.c

@@ -4,8 +4,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_primitive.c,v 1.6 2002/08/21 18:34:04 jgrimm Exp $
- * 
  * These functions implement the SCTP primitive functions from Section 10.
  * 
  * Note that the descriptions from the specification are USER level
@@ -44,7 +42,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_primitive.c,v 1.6 2002/08/21 18:34:04 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/list.h> /* For struct list_head */
@@ -53,7 +50,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_primitive.c,v 1.6 2002
 #include <linux/time.h> /* For struct timeval */
 #include <net/sock.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 #define DECLARE_PRIMITIVE(name) \
 /* This is called in the code as sctp_primitive_ ## name.  */ \

net/sctp/sctp_protocol.c → net/sctp/protocol.c

@@ -8,8 +8,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_protocol.c,v 1.35 2002/08/16 19:30:49 jgrimm Exp $
- * 
  * Initialization/cleanup for SCTP protocol support.  
  * 
  * The SCTP reference implementation is free software; 
@@ -46,7 +44,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_protocol.c,v 1.35 2002/08/16 19:30:49 jgrimm Exp $";
 
 #include <linux/module.h>
 #include <linux/init.h>

net/sctp/sctp_sla1.c → net/sctp/sla1.c

@@ -4,8 +4,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_sla1.c,v 1.4 2002/07/19 22:00:33 jgrimm Exp $
- * 
  * (It's really SHA-1 but Hey I was tired when I created this 
  * file, and on a plane to France :-)
  * 
@@ -45,7 +43,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sla1.c,v 1.4 2002/07/19 22:00:33 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -54,7 +51,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sla1.c,v 1.4 2002/07/1
 #include <linux/sched.h>	/* dead chicken for in.h */
 #include <linux/in.h>		/* for htonl and ntohl */
 
-#include <net/sctp/sctp_sla1.h>
+#include <net/sctp/sla1.h>
 
 void SLA1_Init(struct SLA_1_Context *ctx)
 {

net/sctp/sctp_sm_make_chunk.c → net/sctp/sm_make_chunk.c

@@ -6,8 +6,6 @@
  *
  * This file is part of the SCTP kernel reference Implementation
  *
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_sm_make_chunk.c,v 1.38 2002/07/26 22:52:32 jgrimm Exp $
- *
  * This file includes part of the implementation of the add-IP extension,
  * based on <draft-ietf-tsvwg-addip-sctp-02.txt> June 29, 2001,
  * for the SCTP kernel reference Implementation.
@@ -53,7 +51,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_make_chunk.c,v 1.38 2002/07/26 22:52:32 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -66,7 +63,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_make_chunk.c,v 1.38
 #include <linux/skbuff.h>
 #include <linux/random.h>	/* for get_random_bytes */
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* RFC 2960 3.3.2 Initiation (INIT) (1)
  *

net/sctp/sctp_sm_sideeffect.c → net/sctp/sm_sideeffect.c

@@ -5,8 +5,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_sm_sideeffect.c,v 1.44 2002/08/16 19:30:50 jgrimm Exp $
- * 
  * These functions work with the state functions in sctp_sm_statefuns.c
  * to implement that state operations.  These functions implement the
  * steps which require modifying existing data structures.
@@ -47,7 +45,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_sideeffect.c,v 1.44 2002/08/16 19:30:50 jgrimm Exp $";
 
 #include <linux/skbuff.h>
 #include <linux/types.h>
@@ -55,7 +52,7 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_sideeffect.c,v 1.44
 #include <linux/ip.h>
 #include <net/sock.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Do forward declarations of static functions.  */
 static void sctp_do_ecn_ce_work(sctp_association_t *asoc,
@@ -782,7 +779,7 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
 
 	sctp_bh_lock_sock(asoc->base.sk);
 	if (__sctp_sock_busy(asoc->base.sk)) {
-		SCTP_DEBUG_PRINTK(__FUNCTION__ ":Sock is busy.\n");
+		SCTP_DEBUG_PRINTK("%s:Sock is busy.\n", __FUNCTION__);
 
 		/* Try again later.  */
 		if (!mod_timer(&transport->T3_rtx_timer, jiffies + (HZ/20)))
@@ -821,7 +818,8 @@ static void sctp_generate_timeout_event(sctp_association_t *asoc,
 
 	sctp_bh_lock_sock(asoc->base.sk);
 	if (__sctp_sock_busy(asoc->base.sk)) {
-		SCTP_DEBUG_PRINTK(__FUNCTION__ "Sock is busy: timer %d\n", 
+		SCTP_DEBUG_PRINTK("%s:Sock is busy: timer %d\n",
+				  __FUNCTION__,
 				  timeout_type);
 
 		/* Try again later.  */
@@ -886,7 +884,7 @@ void sctp_generate_heartbeat_event(unsigned long data)
 
 	sctp_bh_lock_sock(asoc->base.sk);
 	if (__sctp_sock_busy(asoc->base.sk)) {
-		SCTP_DEBUG_PRINTK(__FUNCTION__ ":Sock is busy.\n");
+		SCTP_DEBUG_PRINTK("%s:Sock is busy.\n", __FUNCTION__);
 
 		/* Try again later.  */
 		if (!mod_timer(&transport->hb_timer, jiffies + (HZ/20)))

net/sctp/sctp_sm_statefuns.c → net/sctp/sm_statefuns.c

@@ -6,8 +6,6 @@
  *
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_sm_statefuns.c,v 1.49 2002/08/21 18:34:04 jgrimm Exp $
- * 
  * This is part of the SCTP Linux Kernel Reference Implementation.
  *
  * These are the state functions for the state machine.
@@ -49,7 +47,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_statefuns.c,v 1.49 2002/08/21 18:34:04 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -61,8 +58,8 @@ static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_statefuns.c,v 1.49
 #include <net/inet_ecn.h>
 #include <linux/skbuff.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
-#include <net/sctp/sctp_structs.h>
+#include <net/sctp/sm.h>
+#include <net/sctp/structs.h>
 
 /**********************************************************
  * These are the state functions for handling chunk events.
@@ -759,9 +756,9 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const sctp_endpoint_t *ep,
 
 	/* This should never happen, but lets log it if so.  */
 	if (!link) {
-		printk(KERN_WARNING __FUNCTION__
-		       ": Could not find address %d.%d.%d.%d\n",
-		       NIPQUAD(from_addr.v4.sin_addr));
+		printk(KERN_WARNING
+		       "%s: Could not find address %d.%d.%d.%d\n",
+		       __FUNCTION__, NIPQUAD(from_addr.v4.sin_addr));
 		return SCTP_DISPOSITION_DISCARD;
 	}
 
@@ -1386,7 +1383,7 @@ sctp_disposition_t sctp_sf_do_5_2_4_dupcook(const sctp_endpoint_t *ep,
 		break;
 
 	default: /* No such case, discard it. */
-		printk(KERN_WARNING __FUNCTION__ ":unknown case\n");
+		printk(KERN_WARNING "%s:unknown case\n", __FUNCTION__);
 		retval = SCTP_DISPOSITION_DISCARD;
 		break;
         };

net/sctp/sctp_sm_statetable.c → net/sctp/sm_statetable.c

@@ -7,8 +7,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_sm_statetable.c,v 1.21 2002/08/22 02:25:33 jgrimm Exp $
- * 
  * These are the state tables for the SCTP state machine.
  * 
  * The SCTP reference implementation is free software; 
@@ -45,11 +43,10 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sm_statetable.c,v 1.21 2002/08/22 02:25:33 jgrimm Exp $";
 
 #include <linux/skbuff.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 sctp_sm_table_entry_t nop = {fn: sctp_sf_discard_chunk,
 			     name: "sctp_sf_discard_chunk"};

net/sctp/sctp_socket.c → net/sctp/socket.c

@@ -7,8 +7,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_socket.c,v 1.64 2002/08/21 23:06:28 jgrimm Exp $
- * 
  * These functions interface with the sockets layer to implement the
  * SCTP Extensions for the Sockets API.
  * 
@@ -53,7 +51,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_socket.c,v 1.64 2002/08/21 23:06:28 jgrimm Exp $";
 
 #include <linux/config.h>
 #include <linux/types.h>

net/sctp/sctp_sysctl.c → net/sctp/sysctl.c

@@ -3,8 +3,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_sysctl.c,v 1.2 2002/07/12 14:50:25 jgrimm Exp $
- * 
  * Sysctl related interfaces for SCTP. 
  * 
  * The SCTP reference implementation is free software; 
@@ -38,9 +36,8 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_sysctl.c,v 1.2 2002/07/12 14:50:25 jgrimm Exp $";
 
-#include <net/sctp/sctp_structs.h>
+#include <net/sctp/structs.h>
 #include <linux/sysctl.h>
 
 extern sctp_protocol_t sctp_proto;

net/sctp/sctp_transport.c → net/sctp/transport.c

@@ -7,8 +7,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_transport.c,v 1.11 2002/06/20 05:57:01 samudrala Exp $
- * 
  * This module provides the abstraction for an SCTP tranport representing
  * a remote transport address.  For local transport addresses, we just use 
  * sockaddr_storage_t.
@@ -48,7 +46,6 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_transport.c,v 1.11 2002/06/20 05:57:01 samudrala Exp $";
 
 #include <linux/types.h>
 #include <net/sctp/sctp.h>
@@ -281,8 +278,8 @@ void sctp_transport_update_rto(sctp_transport_t *tp, __u32 rtt)
 	 */
 	tp->rto_pending = 0;
 
-	SCTP_DEBUG_PRINTK(__FUNCTION__ ": transport: %p, rtt: %d, srtt: %d "
-			  "rttvar: %d, rto: %d\n",
+	SCTP_DEBUG_PRINTK("%s: transport: %p, rtt: %d, srtt: %d "
+			  "rttvar: %d, rto: %d\n", __FUNCTION__,
 			  tp, rtt, tp->srtt, tp->rttvar, tp->rto);
 }
 
@@ -325,9 +322,10 @@ void sctp_transport_raise_cwnd(sctp_transport_t *transport, __u32 sack_ctsn,
 			cwnd += pmtu;
 		else
 			cwnd += bytes_acked;
-		SCTP_DEBUG_PRINTK(__FUNCTION__ ": SLOW START: transport: %p, "
+		SCTP_DEBUG_PRINTK("%s: SLOW START: transport: %p, "
 				  "bytes_acked: %d, cwnd: %d, ssthresh: %d, "
 				  "flight_size: %d, pba: %d\n",
+				  __FUNCTION__,
 				  transport, bytes_acked, cwnd,
 				  ssthresh, flight_size, pba);
 	} else {
@@ -350,9 +348,10 @@ void sctp_transport_raise_cwnd(sctp_transport_t *transport, __u32 sack_ctsn,
 			cwnd += pmtu;
 			pba = ((cwnd < pba) ? (pba - cwnd) : 0);
 		}
-		SCTP_DEBUG_PRINTK(__FUNCTION__ ": CONGESTION AVOIDANCE: "
+		SCTP_DEBUG_PRINTK("%s: CONGESTION AVOIDANCE: "
 				  "transport: %p, bytes_acked: %d, cwnd: %d, "
 				  "ssthresh: %d, flight_size: %d, pba: %d\n",
+				  __FUNCTION__,
 				  transport, bytes_acked, cwnd,
 				  ssthresh, flight_size, pba);
 	}
@@ -436,7 +435,8 @@ void sctp_transport_lower_cwnd(sctp_transport_t *transport,
 	};
 
 	transport->partial_bytes_acked = 0;
-	SCTP_DEBUG_PRINTK(__FUNCTION__ ": transport: %p reason: %d cwnd: "
-			  "%d ssthresh: %d\n", transport, reason,
+	SCTP_DEBUG_PRINTK("%s: transport: %p reason: %d cwnd: "
+			  "%d ssthresh: %d\n", __FUNCTION__,
+			  transport, reason,
 			  transport->cwnd, transport->ssthresh);
 }

net/sctp/sctp_tsnmap.c → net/sctp/tsnmap.c

@@ -6,8 +6,6 @@
  * 
  * This file is part of the SCTP kernel reference Implementation
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_tsnmap.c,v 1.8 2002/07/26 22:52:32 jgrimm Exp $
- * 
  * These functions manipulate sctp tsn mapping array.
  * 
  * The SCTP reference implementation is free software; 
@@ -42,11 +40,10 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_tsnmap.c,v 1.8 2002/07/26 22:52:32 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 static void _sctp_tsnmap_update(sctp_tsnmap_t *map);
 static void _sctp_tsnmap_update_pending_data(sctp_tsnmap_t *map);

net/sctp/sctp_ulpevent.c → net/sctp/ulpevent.c

@@ -6,8 +6,6 @@
  * Copyright (c) 2001 Nokia, Inc.
  * Copyright (c) 2001 La Monte H.P. Yarroll
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_ulpevent.c,v 1.16 2002/08/21 18:34:04 jgrimm Exp $
- * 
  * These functions manipulate an sctp event.   The sctp_ulpevent_t is used
  * to carry notifications and data to the ULP (sockets).  
  * The SCTP reference implementation is free software; 
@@ -41,13 +39,12 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_ulpevent.c,v 1.16 2002/08/21 18:34:04 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/skbuff.h>
-#include <net/sctp/sctp_structs.h>
+#include <net/sctp/structs.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 static void sctp_rcvmsg_rfree(struct sk_buff *skb);
 static void sctp_ulpevent_set_owner_r(struct sk_buff *skb,

net/sctp/sctp_ulpqueue.c → net/sctp/ulpqueue.c

@@ -6,8 +6,6 @@
  * Copyright (c) 2001 Nokia, Inc.
  * Copyright (c) 2001 La Monte H.P. Yarroll
  * 
- * $Header: /cvsroot/lksctp/lksctp/sctp_cvs/net/sctp/sctp_ulpqueue.c,v 1.14 2002/08/21 18:34:04 jgrimm Exp $
- * 
  * This abstraction carries sctp events to the ULP (sockets).
  * 
  * The SCTP reference implementation is free software; 
@@ -42,14 +40,13 @@
  * Any bugs reported given to us we will try to fix... any fixes shared will
  * be incorporated into the next SCTP release.
  */
-static char *cvs_id __attribute__ ((unused)) = "$Id: sctp_ulpqueue.c,v 1.14 2002/08/21 18:34:04 jgrimm Exp $";
 
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/sctp/sctp_structs.h>
+#include <net/sctp/structs.h>
 #include <net/sctp/sctp.h>
-#include <net/sctp/sctp_sm.h>
+#include <net/sctp/sm.h>
 
 /* Forward declarations for internal helpers.  */
 static inline sctp_ulpevent_t * sctp_ulpqueue_reasm(sctp_ulpqueue_t *ulpq,