Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / sctp / debug.c

diff --git a/net/sctp/debug.c b/net/sctp/debug.c
index 67715f4eb8495e49fa3eb21fa33a96bf80c51514..7ff548a30cfb63b7a85147faed3292c574ae18ef 100644 (file)
--- a/net/sctp/debug.c
+++ b/net/sctp/debug.c
@@ -86,6 +86,9 @@ const char *sctp_cname(const sctp_subtype_t cid)
        case SCTP_CID_FWD_TSN:
                return "FWD_TSN";
 
+       case SCTP_CID_AUTH:
+               return "AUTH";
+
        default:
                break;
        }
@@ -135,6 +138,7 @@ static const char *sctp_primitive_tbl[SCTP_NUM_PRIMITIVE_TYPES] = {
        "PRIMITIVE_ABORT",
        "PRIMITIVE_SEND",
        "PRIMITIVE_REQUESTHEARTBEAT",
+       "PRIMITIVE_ASCONF",
 };
 
 /* Lookup primitive debug name. */