From 7bbe60f2e32aee536e5e618e64eaaf8d60f8c256 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 11 Oct 2008 09:46:24 -0700 Subject: [PATCH] --- yaml --- r: 112269 b: refs/heads/master c: 64f1b65382054f8bfd528f2c4253297c232816eb h: refs/heads/master i: 112267: fbdf95479919b4658497ddf3073b42f809abc73a v: v3 --- [refs] | 2 +- trunk/include/net/netfilter/nf_conntrack_ecache.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f07afc9c2fbb..b6be3e6f2523 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dd9ec4946b4651a295d3bc8df9c15ac692a8f4e +refs/heads/master: 64f1b65382054f8bfd528f2c4253297c232816eb diff --git a/trunk/include/net/netfilter/nf_conntrack_ecache.h b/trunk/include/net/netfilter/nf_conntrack_ecache.h index 11480e633a9f..1285ff26a014 100644 --- a/trunk/include/net/netfilter/nf_conntrack_ecache.h +++ b/trunk/include/net/netfilter/nf_conntrack_ecache.h @@ -63,7 +63,7 @@ extern void nf_conntrack_ecache_fini(struct net *net); #else /* CONFIG_NF_CONNTRACK_EVENTS */ static inline void nf_conntrack_event_cache(enum ip_conntrack_events event, - const struct sk_buff *skb) {} + struct nf_conn *ct) {} static inline void nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct) {} static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct) {}