Eric Lee / smarc-fsl-linux-kernel

01 Dec, 2012

1 commit

  • e7165030d   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch ... Browse Code »

    Conflicts:
    net/ipv6/exthdrs_core.c

    Jesse Gross says:

    ====================
    This series of improvements for 3.8/net-next contains four components:
    * Support for modifying IPv6 headers
    * Support for matching and setting skb->mark for better integration with
    things like iptables
    * Ability to recognize the EtherType for RARP packets
    * Two small performance enhancements

    The movement of ipv6_find_hdr() into exthdrs_core.c causes two small merge
    conflicts. I left it as is but can do the merge if you want. The conflicts
    are:
    * ipv6_find_hdr() and ipv6_find_tlv() were both moved to the bottom of
    exthdrs_core.c. Both should stay.
    * A new use of ipv6_find_hdr() was added to net/netfilter/ipvs/ip_vs_core.c
    after this patch. The IPVS user has two instances of the old constant
    name IP6T_FH_F_FRAG which has been renamed to IP6_FH_F_FRAG.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     

10 Nov, 2012

1 commit

17 Oct, 2012

1 commit

  • 64d7155cd   UAPI: Remove empty non-UAPI Kbuild files ... Browse Code »

    Remove non-UAPI Kbuild files that have become empty as a result of UAPI
    disintegration. They used to have only header-y lines in them and those have
    now moved to the Kbuild files in the corresponding uapi/ directories.

    Possibly these should not be removed but rather have a comment inserted to say
    they are intentionally left blank. This would make it easier to add generated
    header lines in future without having to restore the infrastructure.

    Note that at this point not all the UAPI disintegration parts have been merged,
    so it is likely that more empty Kbuild files will turn up.

    It is probably necessary to make the files non-empty to prevent the patch
    program from automatically deleting them when it reduces them to nothing.

    Signed-off-by: David Howells

    David Howells
     

09 Oct, 2012

1 commit

30 Aug, 2012

1 commit

09 May, 2012

1 commit

  • 84018f55a   netfilter: ip6_tables: add flags parameter to ipv6_find_hdr() ... Browse Code »

    This patch adds the flags parameter to ipv6_find_hdr. This flags
    allows us to:

    * know if this is a fragment.
    * stop at the AH header, so the information contained in that header
    can be used for some specific packet handling.

    This patch also adds the offset parameter for inspection of one
    inner IPv6 header that is contained in error messages.

    Signed-off-by: Hans Schillstrom
    Signed-off-by: Pablo Neira Ayuso

    Hans Schillstrom
     

09 Apr, 2012

1 commit

  • 95ad2f873   netfilter: ip6_tables: ip6t_ext_hdr is now static inline ... Browse Code »

    We may hit this in xt_LOG:

    net/built-in.o:xt_LOG.c:function dump_ipv6_packet:
    error: undefined reference to 'ip6t_ext_hdr'

    happens with these config options:

    CONFIG_NETFILTER_XT_TARGET_LOG=y
    CONFIG_IP6_NF_IPTABLES=m

    ip6t_ext_hdr is fairly small and it is called in the packet path.
    Make it static inline.

    Reported-by: Simon Kirby
    Signed-off-by: Pablo Neira Ayuso

    Pablo Neira Ayuso
     

08 Mar, 2012

1 commit

27 Aug, 2011

1 commit

21 Jan, 2011

1 commit

18 Jan, 2011

1 commit

14 Oct, 2010

5 commits

15 Aug, 2010

1 commit

28 Jun, 2010

1 commit

  • 7eb9282cd   netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC header ... Browse Code »

    The LOG targets print the entire MAC header as one long string, which is not
    readable very well:

    IN=eth0 OUT= MAC=00:15:f2:24:91:f8:00:1b:24:dc:61:e6:08:00 ...

    Add an option to decode known header formats (currently just ARPHRD_ETHER devices)
    in their individual fields:

    IN=eth0 OUT= MACSRC=00:1b:24:dc:61:e6 MACDST=00:15:f2:24:91:f8 MACPROTO=0800 ...
    IN=eth0 OUT= MACSRC=00:1b:24:dc:61:e6 MACDST=00:15:f2:24:91:f8 MACPROTO=86dd ...

    The option needs to be explicitly enabled by userspace to avoid breaking
    existing parsers.

    Signed-off-by: Patrick McHardy

    Patrick McHardy
     

08 Mar, 2010

1 commit

25 Feb, 2010

2 commits

11 Feb, 2010

1 commit

18 Jan, 2010

1 commit

05 Nov, 2009

1 commit

  • d94d9fee9   net: cleanup include/linux ... Browse Code »

    This cleanup patch puts struct/union/enum opening braces,
    in first line to ease grep games.

    struct something
    {

    becomes :

    struct something {

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     

24 Aug, 2009

1 commit

10 Aug, 2009

2 commits

27 Mar, 2009

2 commits

  • ba1eb95cf   Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern… ... Browse Code »

    …el/git/tip/linux-2.6-tip

    * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
    x86: headers cleanup - setup.h
    emu101k1.h: fix duplicate include of <linux/types.h>
    compiler-gcc4: conditionalize #error on __KERNEL__
    remove __KERNEL_STRICT_NAMES
    make netfilter use strict integer types
    make drm headers use strict integer types
    make MTD headers use strict integer types
    make most exported headers use strict integer types
    make exported headers use strict posix types
    unconditionally include asm/types.h from linux/types.h
    make linux/types.h as assembly safe
    Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
    headers_check fix cleanup: linux/reiserfs_fs.h
    headers_check fix cleanup: linux/nubus.h
    headers_check fix cleanup: linux/coda_psdev.h
    headers_check fix: x86, setup.h
    headers_check fix: x86, prctl.h
    headers_check fix: linux/reinserfs_fs.h
    headers_check fix: linux/socket.h
    headers_check fix: linux/nubus.h
    ...

    Manually fix trivial conflicts in:
    include/linux/netfilter/xt_limit.h
    include/linux/netfilter/xt_statistic.h

    Linus Torvalds
     
  • 85efde6f4   make exported headers use strict posix types ... Browse Code »

    A number of standard posix types are used in exported headers, which
    is not allowed if __STRICT_KERNEL_NAMES is defined. In order to
    get rid of the non-__STRICT_KERNEL_NAMES part and to make sane headers
    the default, we have to change them all to safe types.

    There are also still some leftovers in reiserfs_fs.h, elfcore.h
    and coda.h, but these files have not compiled in user space for
    a long time.

    This leaves out the various integer types ({u_,u,}int{8,16,32,64}_t),
    which we take care of separately.

    Signed-off-by: Arnd Bergmann
    Acked-by: Mauro Carvalho Chehab
    Cc: David Airlie
    Cc: Arnaldo Carvalho de Melo
    Cc: YOSHIFUJI Hideaki
    Cc: netdev@vger.kernel.org
    Cc: linux-ppp@vger.kernel.org
    Cc: Jaroslav Kysela
    Cc: Takashi Iwai
    Cc: David Woodhouse
    Signed-off-by: H. Peter Anvin
    Signed-off-by: Ingo Molnar

    Arnd Bergmann
     

24 Feb, 2009

1 commit

20 Nov, 2008

1 commit

22 May, 2008

1 commit

  • c8942f1f0   netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ ... Browse Code »

    Greg Steuck points out that some of the netfilter
    headers can't be used in userspace without including linux/types.h
    first. The headers include their own linux/types.h include statements,
    these are stripped by make headers-install because they are inside
    #ifdef __KERNEL__ however. Move them out to fix this.

    Reported and Tested by Greg Steuck.

    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Patrick McHardy
     

01 Feb, 2008

2 commits

  • 336b517fd   [NETFILTER]: ip6_tables: netns preparation ... Browse Code »

    * Propagate netns from userspace down to xt_find_table_lock()
    * Register ip6 tables in netns (modules still use init_net)

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     
  • 44d34e721   [NETFILTER]: x_tables: return new table from {arp,ip,ip6}t_register_table() ... Browse Code »

    Typical table module registers xt_table structure (i.e. packet_filter)
    and link it to list during it. We can't use one template for it because
    corresponding list_head will become corrupted. We also can't unregister
    with template because it wasn't changed at all and thus doesn't know in
    which list it is.

    So, we duplicate template at the very first step of table registration.
    Table modules will save it for use during unregistration time and actual
    filtering.

    Do it at once to not screw bisection.

    P.S.: renaming i.e. packet_filter => __packet_filter is temporary until
    full netnsization of table modules is done.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     

29 Jan, 2008

4 commits

07 Nov, 2007

1 commit

16 Oct, 2007

1 commit