Patchwork [GIT] : Networking for 2.6.28

login
register
mail settings
Submitter Linus Torvalds
Date Oct. 11, 2008, 4:46 p.m.
Message ID <alpine.LFD.2.00.0810110945420.3402@nehalem.linux-foundation.org>
Download mbox | patch
Permalink /patch/4011/
State Accepted
Delegated to: David Miller
Headers show

Comments

Linus Torvalds - Oct. 11, 2008, 4:46 p.m.
On Sat, 11 Oct 2008, Linus Torvalds wrote:
> 
> Please fix ASAP.

Ahh. I think this fixes it.

		Linus

---
 include/net/netfilter/nf_conntrack_ecache.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Patrick McHardy - Oct. 11, 2008, 4:48 p.m.
Linus Torvalds wrote:
> 
> On Sat, 11 Oct 2008, Linus Torvalds wrote:
>> Please fix ASAP.
> 
> Ahh. I think this fixes it.

So I'm too late already :) Thanks and sorry for the mess up.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 11480e6..1285ff2 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/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) {}