Re: [PATCH] Netfilter: Fix some coding styles and remove moduleparam.h

[wzt wzt]

hi, kaber, this patch is already based on nf-next git trees.

On Fri, Mar 26, 2010 at 11:44 AM,  <wzt.wzt@xxxxxxxxx> wrote:
> Fix some coding styles and remove moduleparam.h
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@xxxxxxxxxxxxxxx>
>
> ---
> Ânet/ipv4/netfilter/nf_nat_standalone.c | Â Â3 +--
> Ânet/ipv4/netfilter/nf_nat_tftp.c    |  Â1 -
> Ânet/netfilter/nf_conntrack_proto.c   |  Â2 --
> Â3 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c
> index 5678e95..0b49248 100644
> --- a/net/ipv4/netfilter/nf_nat_standalone.c
> +++ b/net/ipv4/netfilter/nf_nat_standalone.c
> @@ -137,9 +137,8 @@ nf_nat_fn(unsigned int hooknum,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âret = nf_nat_rule_find(skb, hooknum, in, out,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ct);
>
> - Â Â Â Â Â Â Â Â Â Â Â if (ret != NF_ACCEPT) {
> + Â Â Â Â Â Â Â Â Â Â Â if (ret != NF_ACCEPT)
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âreturn ret;
> - Â Â Â Â Â Â Â Â Â Â Â }
> Â Â Â Â Â Â Â Â} else
> Â Â Â Â Â Â Â Â Â Â Â Âpr_debug("Already setup manip %s for ct %p\n",
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â maniptype == IP_NAT_MANIP_SRC ? "SRC" : "DST",
> diff --git a/net/ipv4/netfilter/nf_nat_tftp.c b/net/ipv4/netfilter/nf_nat_tftp.c
> index b096e81..7274a43 100644
> --- a/net/ipv4/netfilter/nf_nat_tftp.c
> +++ b/net/ipv4/netfilter/nf_nat_tftp.c
> @@ -6,7 +6,6 @@
> Â*/
>
> Â#include <linux/module.h>
> -#include <linux/moduleparam.h>
> Â#include <linux/udp.h>
>
> Â#include <net/netfilter/nf_nat_helper.h>
> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
> index 1a4568b..f71cd5d 100644
> --- a/net/netfilter/nf_conntrack_proto.c
> +++ b/net/netfilter/nf_conntrack_proto.c
> @@ -13,12 +13,10 @@
> Â#include <linux/netfilter.h>
> Â#include <linux/module.h>
> Â#include <linux/mutex.h>
> -#include <linux/skbuff.h>
> Â#include <linux/vmalloc.h>
> Â#include <linux/stddef.h>
> Â#include <linux/err.h>
> Â#include <linux/percpu.h>
> -#include <linux/moduleparam.h>
> Â#include <linux/notifier.h>
> Â#include <linux/kernel.h>
> Â#include <linux/netdevice.h>
> --
> 1.6.5.3
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/