From: "Kok, Auke" <auke-jan.h.kok@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Alexey Dobriyan <adobriyan@sw.ru>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: 2.6.21-rc5-mm3: fix e1000 compilation
Date: Fri, 30 Mar 2007 10:27:50 -0700 [thread overview]
Message-ID: <460D4896.9090302@intel.com> (raw)
In-Reply-To: <20070330100709.44127796.randy.dunlap@oracle.com>
Randy Dunlap wrote:
> On Fri, 30 Mar 2007 10:01:04 -0700 Andrew Morton wrote:
>
>> On Fri, 30 Mar 2007 07:39:04 -0700 "Kok, Auke" <auke-jan.h.kok@intel.com> wrote:
>>
>>> Alexey Dobriyan wrote:
>>>> CC [M] drivers/net/e1000/e1000_main.o
>>>> drivers/net/e1000/e1000_main.c: In function 'e1000_tso':
>>>> drivers/net/e1000/e1000_main.c:2968: error: dereferencing pointer to incomplete type
>>>> ...
>>>>
>>> can you send me your config? I'd like to see why nobody here didn't spot this on
>>> any of our tests.
>>>
>> test.kernel.org got thoroughly broken by e1000, but Alexey's patch fixed things
>> up.
>
> My daily/nightly builds were also broken by it...
turns out that NETIF_F_TSO6 is defined even if CONFIG_IPV6 is turned off, which
is what broke e1000. That in itself might be a problem. Perhaps this should be
fixed in netdevice.h (gratuitous bad inline patch below) but I'm not sure if
people would appreciate this, as it's rather ugly, and it gets all horrible when
people disable TCP protocol support...
In any case, I was not suspecting this at all. The patch to e1000 is fine with me.
Auke
---
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1a52854..f077137 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -331,10 +331,16 @@ struct net_device
#define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT)
#define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)
#define NETIF_F_TSO_ECN (SKB_GSO_TCP_ECN << NETIF_F_GSO_SHIFT)
+#ifdef CONFIG_IPV6
#define NETIF_F_TSO6 (SKB_GSO_TCPV6 << NETIF_F_GSO_SHIFT)
+#endif
/* List of features with software fallbacks. */
+#ifdef CONFIG_IPV6
#define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)
+#else
+#define NETIF_F_GSO_SOFTWARE (NETIF_F_TSO | NETIF_F_TSO_ECN)
+#endif
#define NETIF_F_GEN_CSUM (NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)
#define NETIF_F_ALL_CSUM (NETIF_F_IP_CSUM | NETIF_F_GEN_CSUM)
next prev parent reply other threads:[~2007-03-30 17:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-30 8:50 2.6.21-rc5-mm3: fix e1000 compilation Alexey Dobriyan
2007-03-30 14:39 ` Kok, Auke
2007-03-30 15:05 ` Alexey Dobriyan
2007-03-30 17:01 ` Andrew Morton
2007-03-30 17:07 ` Randy Dunlap
2007-03-30 17:27 ` Kok, Auke [this message]
2007-03-30 21:20 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=460D4896.9090302@intel.com \
--to=auke-jan.h.kok@intel.com \
--cc=adobriyan@sw.ru \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).