From 1136ff22b78ee0c3f671b52fcbed8ecff754a55f Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 25 Mar 2008 20:08:17 -0700
Subject: [PATCH] --- yaml --- r: 90338 b: refs/heads/master c:
 4bb119eab7b724109d8eeb0f8d86ed1e4953d338 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/net/netfilter/nf_conntrack_expect.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b57cca6cc622..4423150bf993 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d9d752259ab2e16b99f84b7e7bd4a30c884c289
+refs/heads/master: 4bb119eab7b724109d8eeb0f8d86ed1e4953d338
diff --git a/trunk/net/netfilter/nf_conntrack_expect.c b/trunk/net/netfilter/nf_conntrack_expect.c
index 740d94d30091..4c05a588116f 100644
--- a/trunk/net/netfilter/nf_conntrack_expect.c
+++ b/trunk/net/netfilter/nf_conntrack_expect.c
@@ -475,6 +475,10 @@ static int exp_seq_show(struct seq_file *s, void *v)
 		    __nf_ct_l3proto_find(expect->tuple.src.l3num),
 		    __nf_ct_l4proto_find(expect->tuple.src.l3num,
 				       expect->tuple.dst.protonum));
+
+	if (expect->flags & NF_CT_EXPECT_PERMANENT)
+		seq_printf(s, "PERMANENT ");
+
 	return seq_putc(s, '\n');
 }