---

yaml --- r: 314573 b: refs/heads/master c: 8e36c4b h: refs/heads/master i: 314571: b6036d2 v: v3
git-mirror · Jun 23, 2012 · 2c75e8a · 2c75e8a
1 parent 7201f5c
commit 2c75e8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab5e8b77d53ac8d4c7d9beafc73815da00cf19a5
+refs/heads/master: 8e36c4b5b673edc6081599b8bd461e062e4910f4
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -478,7 +478,6 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq, u32 type,
 	return -1;
 }
 
-#ifdef CONFIG_NF_CONNTRACK_EVENTS
 static inline size_t
 ctnetlink_proto_size(const struct nf_conn *ct)
 {
@@ -565,6 +564,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
 	       ;
 }
 
+#ifdef CONFIG_NF_CONNTRACK_EVENTS
 static int
 ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item)
 {