From 949e5ed5b007c5e0f5fd55370eaaa279e624bbdf Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 28 Nov 2006 20:53:39 -0800 Subject: [PATCH] --- yaml --- r: 41138 b: refs/heads/master c: e81c73596704793e73e6dbb478f41686f15a4b34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 12c14a61b593..c229f66e7511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af443b6d90de17f7630621269cf0610d9d772670 +refs/heads/master: e81c73596704793e73e6dbb478f41686f15a4b34 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 9264139bd8df..83b8c4f1d69d 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -93,8 +93,10 @@ struct netpoll_info; #endif #endif -#if !defined(CONFIG_NET_IPIP) && \ - !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) +#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \ + !defined(CONFIG_NET_IPGRE) && !defined(CONFIG_NET_IPGRE_MODULE) && \ + !defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \ + !defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE) #define MAX_HEADER LL_MAX_HEADER #else #define MAX_HEADER (LL_MAX_HEADER + 48)