[PATCH] [TRIVIAL] Fix ipt_helper compilation. Was: Linux v2.6.0-test2

From: Florin Iucha (florin_at_iucha.net)
Date: 07/27/03

  • Next message: Felipe Alfaro Solana: "Re: [PATCH] O10int for interactivity" 
    Date:	Sun, 27 Jul 2003 15:22:34 -0500
To: Linus Torvalds <torvalds@osdl.org>

    On Sun, Jul 27, 2003 at 10:08:40AM -0700, Linus Torvalds wrote:
    [snip]
    > o [NETFILTER]: Fix ip_nat_ftp in 2.6.0-test1
    > o [NETFILTER]: Re-sync ipt_REJECT with 2.4.x
    > o [NETFILTER]: Fix a bug in the IRC DCC command parser of
    > ip_conntrack_irc
    > o [NETFILTER]: Fix typo in ipt_MIRROR.c
    > o [NETFILTER]: Make REJECT target compliant with RFC 1812
    > o [NETFILTER]: Fix various problems with MIRROR target
    > o [NETFILTER]: Fix issues with REJECT and MIRROR targets wrt. policy
    > routing
    > o [NETFILTER]: Fix locking of ipt_helper
    > o [NETFILTER]: Drop reference to conntrack after removing confirmed
    > expectation

    One of these broke the compilation of net/ipv4/netfilter/ipt_helper.o:
      CC [M] net/ipv4/netfilter/ipt_helper.o
    In file included from net/ipv4/netfilter/ipt_helper.c:13:
    include/linux/netfilter_ipv4/ip_conntrack_core.h: In function `ip_conntrack_confirm':
    include/linux/netfilter_ipv4/ip_conntrack_core.h:46: error: `NF_ACCEPT' undeclared (first use in this function)
    include/linux/netfilter_ipv4/ip_conntrack_core.h:46: error: (Each undeclared identifier is reported only once
    include/linux/netfilter_ipv4/ip_conntrack_core.h:46: error: for each function it appears in.)

    This trivial patch fixes it:

    --- net/ipv4/netfilter/ipt_helper.c.orig 2003-07-27 15:19:49.000000000 -0500
    +++ net/ipv4/netfilter/ipt_helper.c 2003-07-27 15:07:55.000000000 -0500
    @@ -9,6 +9,7 @@
      */
     #include <linux/module.h>
     #include <linux/skbuff.h>
    +#include <linux/netfilter.h>
     #include <linux/netfilter_ipv4/ip_conntrack.h>
     #include <linux/netfilter_ipv4/ip_conntrack_core.h>
     #include <linux/netfilter_ipv4/ip_conntrack_helper.h>

    florin 

    -- 
"NT is to UNIX what a doughnut is to a particle accelerator."

    -
    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/

    • application/pgp-signature attachment: stored
  • Next message: Felipe Alfaro Solana: "Re: [PATCH] O10int for interactivity"

    Relevant Pages