Sriram Yagnaraman <sriram.yagnaraman@xxxxxxxx> wrote:
> diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
> index d88b92a8ffca..5166d8b9b394 100644
> --- a/net/netfilter/nf_conntrack_proto_sctp.c
> +++ b/net/netfilter/nf_conntrack_proto_sctp.c
> @@ -5,12 +5,13 @@
> * Copyright (c) 2004 Kiran Kumar Immidi <immidi_kiran@xxxxxxxxx>
> * Copyright (c) 2004-2012 Patrick McHardy <kaber@xxxxxxxxx>
> *
> - * SCTP is defined in RFC 2960. References to various sections in this code
> + * SCTP is defined in RFC 4960. References to various sections in this code
> * are to this RFC.
> */
>
> #include <linux/types.h>
> #include <linux/timer.h>
> +#include <linux/jiffies.h>
> #include <linux/netfilter.h>
> #include <linux/in.h>
> #include <linux/ip.h>
> @@ -27,127 +28,19 @@
> #include <net/netfilter/nf_conntrack_ecache.h>
> #include <net/netfilter/nf_conntrack_timeout.h>
>
> -/* FIXME: Examine ipfilter's timeouts and conntrack transitions more
> - closely. They're more complex. --RR
> -
> - And so for me for SCTP :D -Kiran */
> +#define SCTP_FLAG_HEARTBEAT_VTAG_FAILED 1
>
> static const char *const sctp_conntrack_names[] = {
> "NONE",
> - "CLOSED",
> - "COOKIE_WAIT",
> - "COOKIE_ECHOED",
> + "OPEN_WAIT",
> "ESTABLISHED",
You either need to leave the other strings in place or you need to use
[SCTP_CONNTRACK_ESTABLISHED] = "ESTABLISHED",
else the mapping of enum value to string isn't correct anymore.
