]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[NET]: Fix MAX_HEADER setting.
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 29 Nov 2006 04:53:39 +0000 (20:53 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 29 Nov 2006 04:59:39 +0000 (20:59 -0800)
commite81c73596704793e73e6dbb478f41686f15a4b34
tree4068f2efd7ede53492cecaa939951fff0b02fdfe
parentaf443b6d90de17f7630621269cf0610d9d772670
[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>
include/linux/netdevice.h