Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758803AbYJKQqy (ORCPT ); Sat, 11 Oct 2008 12:46:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754242AbYJKQqo (ORCPT ); Sat, 11 Oct 2008 12:46:44 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:48920 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753183AbYJKQqn (ORCPT ); Sat, 11 Oct 2008 12:46:43 -0400 Date: Sat, 11 Oct 2008 09:46:09 -0700 (PDT) From: Linus Torvalds To: David Miller cc: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT]: Networking for 2.6.28 In-Reply-To: Message-ID: References: <20081010.144921.115563930.davem@davemloft.net> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1141 Lines: 32 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(-) 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) {} -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/