* net-2.6.24 compile breakage: error: 'ipgre_header' undeclared
@ 2007-10-04 21:49 Kok, Auke
2007-10-04 22:11 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Kok, Auke @ 2007-10-04 21:49 UTC (permalink / raw)
To: NetDev; +Cc: David S. Miller, Stephen Hemminger
I'm getting this on net-2.6.24 today:
CC [M] net/ipv4/ip_gre.o
net/ipv4/ip_gre.c:1135: error: 'ipgre_header' undeclared here (not in a function)
make[2]: *** [net/ipv4/ip_gre.o] Error 1
make[1]: *** [net/ipv4] Error 2
make[1]: *** Waiting for unfinished jobs....
the git log says sch touched it last:
commit 2c1d70cafc188843ae15a1a504a0a3c9f3c0318d
Author: Stephen Hemminger <shemminger@linux-foundation•org>
Date: Wed Sep 26 22:19:06 2007 -0700
[NET]: Move hardware header operations out of netdevice.
Since hardware header operations are part of the protocol class
not the device instance, make them into a separate object and
save memory.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation•org>
Signed-off-by: David S. Miller <davem@davemloft•net>
anyone seen this? let me know if you want my .config.
PS: No, I didn't touch anything besides e1000e in that tree ;)
Auke
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: net-2.6.24 compile breakage: error: 'ipgre_header' undeclared
2007-10-04 21:49 net-2.6.24 compile breakage: error: 'ipgre_header' undeclared Kok, Auke
@ 2007-10-04 22:11 ` David Miller
2007-10-05 0:47 ` [PATCH net-2.6.24] ip_gre: build fix Stephen Hemminger
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2007-10-04 22:11 UTC (permalink / raw)
To: auke-jan.h.kok; +Cc: netdev, shemminger
From: "Kok, Auke" <auke-jan.h.kok@intel•com>
Date: Thu, 04 Oct 2007 14:49:10 -0700
> I'm getting this on net-2.6.24 today:
>
> CC [M] net/ipv4/ip_gre.o
> net/ipv4/ip_gre.c:1135: error: 'ipgre_header' undeclared here (not in a function)
> make[2]: *** [net/ipv4/ip_gre.o] Error 1
> make[1]: *** [net/ipv4] Error 2
> make[1]: *** Waiting for unfinished jobs....
>
>
> the git log says sch touched it last:
Please us Stephen's current email address if you really want to reach
him :) It was even mentioned in the commit sign off. I've fixed it up
in the CC:
> [NET]: Move hardware header operations out of netdevice.
>
> Since hardware header operations are part of the protocol class
> not the device instance, make them into a separate object and
> save memory.
>
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation•org>
> Signed-off-by: David S. Miller <davem@davemloft•net>
Stephen, we need to handle the case where NET_IPGRE_BROADCAST is
not enabled. ipgre_header() is only compiled in when that is
set, but you reference it unconditionally.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-2.6.24] ip_gre: build fix
2007-10-04 22:11 ` David Miller
@ 2007-10-05 0:47 ` Stephen Hemminger
2007-10-05 0:54 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2007-10-05 0:47 UTC (permalink / raw)
To: David Miller; +Cc: auke-jan.h.kok, netdev
IPGRE only uses header_ops in the case of CONFIG_NET_IPGRE_BROADCAST.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation•org>
--- a/net/ipv4/ip_gre.c 2007-10-04 17:40:34.000000000 -0700
+++ b/net/ipv4/ip_gre.c 2007-10-04 17:41:20.000000000 -0700
@@ -1092,6 +1092,10 @@ static int ipgre_header(struct sk_buff *
return -t->hlen;
}
+static const struct header_ops ipgre_header_ops = {
+ .create = ipgre_header,
+};
+
static int ipgre_open(struct net_device *dev)
{
struct ip_tunnel *t = netdev_priv(dev);
@@ -1131,10 +1135,6 @@ static int ipgre_close(struct net_device
#endif
-static const struct header_ops ipgre_header_ops = {
- .create = ipgre_header,
-};
-
static void ipgre_tunnel_setup(struct net_device *dev)
{
dev->uninit = ipgre_tunnel_uninit;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-10-05 0:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-04 21:49 net-2.6.24 compile breakage: error: 'ipgre_header' undeclared Kok, Auke
2007-10-04 22:11 ` David Miller
2007-10-05 0:47 ` [PATCH net-2.6.24] ip_gre: build fix Stephen Hemminger
2007-10-05 0:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox