1. 30 11月, 2006 38 次提交
  2. 29 11月, 2006 2 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 1275361c
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Fix MAX_HEADER setting.
        [NETFILTER]: ipt_REJECT: fix memory corruption
        [NETFILTER]: conntrack: fix refcount leak when finding expectation
        [NETFILTER]: ctnetlink: fix reference count leak
        [NETFILTER]: nf_conntrack: fix the race on assign helper to new conntrack
        [NETFILTER]: nfctnetlink: assign helper to newly created conntrack
      1275361c
    • D
      [NET]: Fix MAX_HEADER setting. · e81c7359
      David S. Miller 提交于
      MAX_HEADER is either set to LL_MAX_HEADER or LL_MAX_HEADER + 48, and
      this is controlled by a set of CONFIG_* ifdef tests.
      
      It is trying to use LL_MAX_HEADER + 48 when any of the tunnels are
      enabled which set hard_header_len like this:
      
      dev->hard_header_len = LL_MAX_HEADER + sizeof(struct xxx);
      
      The correct set of tunnel drivers which do this are:
      
      ipip
      ip_gre
      ip6_tunnel
      sit
      
      so make the ifdef test match.
      
      Noticed by Patrick McHardy and with help from Herbert Xu.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e81c7359