From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 29 Nov 2006 04:53:39 +0000 (-0800)
Subject: [NET]: Fix MAX_HEADER setting.
X-Git-Tag: v2.6.19~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e81c73596704793e73e6dbb478f41686f15a4b34;p=pandora-kernel.git

[NET]: Fix MAX_HEADER setting.

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: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed