From b99260b5db9bdcef99bc20b1e07237cc70e49035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Sat, 5 Jan 2008 23:11:31 -0800
Subject: [PATCH] --- yaml --- r: 78679 b: refs/heads/master c:
 bb5cf80e94ad9650c4bd39e92fb917af8e87fa43 h: refs/heads/master i:   78677:
 1fa3fb4e69437c8972ee0290977b0969c27b6714   78675:
 254d36c9b6aeb02123f57fecf3025bdf3f09ae53   78671:
 d46b592d11100e8d2b14b5220734bbfb0b4d9196 v: v3

---
 [refs]                                     |  2 +-
 trunk/net/netfilter/nf_conntrack_netlink.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1e4664327566..840bd313397c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a75de0c1de2dde9ef41aeb45a21048681421b8a
+refs/heads/master: bb5cf80e94ad9650c4bd39e92fb917af8e87fa43
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
index d93d58d688b9..38141f104db7 100644
--- a/trunk/net/netfilter/nf_conntrack_netlink.c
+++ b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -95,7 +95,7 @@ ctnetlink_dump_tuples_ip(struct sk_buff *skb,
 	return -1;
 }
 
-static inline int
+static int
 ctnetlink_dump_tuples(struct sk_buff *skb,
 		      const struct nf_conntrack_tuple *tuple)
 {
@@ -205,7 +205,7 @@ ctnetlink_dump_helpinfo(struct sk_buff *skb, const struct nf_conn *ct)
 }
 
 #ifdef CONFIG_NF_CT_ACCT
-static inline int
+static int
 ctnetlink_dump_counters(struct sk_buff *skb, const struct nf_conn *ct,
 			enum ip_conntrack_dir dir)
 {
@@ -284,7 +284,7 @@ ctnetlink_dump_master(struct sk_buff *skb, const struct nf_conn *ct)
 }
 
 #ifdef CONFIG_NF_NAT_NEEDED
-static inline int
+static int
 dump_nat_seq_adj(struct sk_buff *skb, const struct nf_nat_seq *natseq, int type)
 {
 	struct nlattr *nest_parms;
@@ -648,7 +648,7 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr,
 	return ret;
 }
 
-static inline int
+static int
 ctnetlink_parse_tuple(struct nlattr *cda[], struct nf_conntrack_tuple *tuple,
 		      enum ctattr_tuple type, u_int8_t l3num)
 {
@@ -888,7 +888,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
 	return err;
 }
 
-static inline int
+static int
 ctnetlink_change_status(struct nf_conn *ct, struct nlattr *cda[])
 {
 	unsigned long d;
@@ -1349,7 +1349,7 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb,
 	return -1;
 }
 
-static inline int
+static int
 ctnetlink_exp_dump_expect(struct sk_buff *skb,
 			  const struct nf_conntrack_expect *exp)
 {