]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
net: fix dummy 'nf_conntrack_event_cache()'
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Oct 2008 16:46:24 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Oct 2008 16:46:24 +0000 (09:46 -0700)
The dummy version of 'nf_conntrack_event_cache()' (used when the
NF_CONNTRACK_EVENTS config option is not enabled) had not been updated
when the calling convention changed.

This was introduced by commit a71996fccce4b2086a26036aa3c915365ca36926
("netfilter: netns nf_conntrack: pass conntrack to
nf_conntrack_event_cache() not skb")

Tssk.

Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/net/netfilter/nf_conntrack_ecache.h

index 11480e633a9f2511f78d3eeba9396c3cdb1c7df3..1285ff26a0145fc408dd8ca6b4035bca69d91f28 100644 (file)
@@ -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) {}