From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick McHardy Subject: Re: [PATCH iptables] extensions: libxt_rateest: fix bps options for iptables-save Date: Thu, 15 Jul 2010 18:17:55 +0200 Message-ID: <4C3F34B3.3050601@trash.net> References: <1279209884-7172-1-git-send-email-luciano.coelho@nokia.com> <4C3F32FD.6050706@trash.net> <1279210476.1575.1.camel@powerslave> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: "netfilter-devel@vger.kernel.org" To: Luciano Coelho Return-path: Received: from stinky.trash.net ([213.144.137.162]:47853 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933658Ab0GOQR5 (ORCPT ); Thu, 15 Jul 2010 12:17:57 -0400 In-Reply-To: <1279210476.1575.1.camel@powerslave> Sender: netfilter-devel-owner@vger.kernel.org List-ID: Am 15.07.2010 18:14, schrieb Luciano Coelho: > On Thu, 2010-07-15 at 18:10 +0200, ext Patrick McHardy wrote: >> Am 15.07.2010 18:04, schrieb Luciano Coelho: >>> The output generated by the libxt_rateest extension for bps matches >>> was wrong and could not be restored properly. This patch fixes this >>> problem by using the correct options in the right order when saving >>> the table. >> >> Applied, thanks. > > A quick question: do you apply this to iptables-next? Or iptables-next > will only be aligned with master when you merge them (when the stuff > included in iptables-next gets released in the kernel)? > This one was applied to the master branch. The iptables-next branch contains support for new features that will be merged during the next merge window. The branch will be merged once the iptables release for the 2.6.35 kernel is out.