Merge touki.austin.ibm.com:/home/jgrimm/bk/lksctp-2.5

into touki.austin.ibm.com:/home/jgrimm/bk/lksctp-2.5.work

include/linux/sctp.h

 /* SCTP kernel reference Implementation
  * Copyright (c) 1999-2000 Cisco, Inc.
  * Copyright (c) 1999-2001 Motorola, Inc.
- * Copyright (c) 2001 International Business Machines, Corp.
+ * Copyright (c) 2001-2002 International Business Machines, Corp.
  * Copyright (c) 2001 Intel Corp.
  * Copyright (c) 2001 Nokia, Inc.
  * Copyright (c) 2001 La Monte H.P. Yarroll
@@ -29,7 +29,7 @@
  *
  * Please send any bug reports or fixes you make to the
  * email address(es):
- *    lksctp developers <sctp-developers-list@cig.mot.com>
+ *    lksctp developers <lksctp-developerst@lists.sourceforge.net>
  *
  * Or submit a bug report through the following website:
  *    http://www.sf.net/projects/lksctp
@@ -419,10 +419,12 @@ typedef enum {
 	/* SCTP Implementation Guide:
 	 *  11  Restart of an association with new addresses
 	 *  12  User Initiated Abort
+	 *  13  Protocol Violation
 	 */
 
 	SCTP_ERROR_RESTART         = __constant_htons(0x0b),
 	SCTP_ERROR_USER_ABORT      = __constant_htons(0x0c),
+	SCTP_ERROR_PROTO_VIOLATION = __constant_htons(0x0d),
 
 	/* ADDIP Section 3.3  New Error Causes
 	 *
@@ -583,7 +585,4 @@ typedef struct {
 	sctpAsconfAckRsp_t TLV;
 } sctpAsconfAckRspNode_t;
 
-
-
-
 #endif /* __LINUX_SCTP_H__ */