net-2.6.24 compile breakage: error: 'ipgre_header' undeclared

net-2.6.24 compile breakage: error: 'ipgre_header' undeclared

[Kok, Auke]

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

Re: net-2.6.24 compile breakage: error: 'ipgre_header' undeclared

[David Miller]

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.

[PATCH net-2.6.24] ip_gre: build fix

[Stephen Hemminger]

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;

Re: [PATCH net-2.6.24] ip_gre: build fix

[David Miller]

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 4 Oct 2007 17:47:38 -0700

> IPGRE only uses header_ops in the case of CONFIG_NET_IPGRE_BROADCAST.
> 
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

Applied, thanks Stephen.