[PATCH] Networking: ip_gre init corrected

[PATCH] Networking: ip_gre init corrected

[Sam Ravnborg]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

Hi Networking Maintainers.

While playing around with kbuild I stumbled over this warning:
/net/ipv4/ip_gre.c:123: warning: initialization makes integer from pointer without a cast

Looking into the source it seemed that an init function was not properly
initialised, probarly due to added members in net_device.

Attached patch fixes this, but I did not know how to test it.

	Sam

[-- Attachment #2: ip_gre_init.patch --]
[-- Type: text/plain, Size: 1171 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.471   -> 1.472  
#	   net/ipv4/ip_gre.c	1.7     -> 1.8    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/06/08	sam@mars.ravnborg.org	1.472
# net/ipv4/ip_gre.c: Get rid of warning.
# _init function properly initialised.
# --------------------------------------------
#
diff -Nru a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
--- a/net/ipv4/ip_gre.c	Sat Jun  8 21:37:51 2002
+++ b/net/ipv4/ip_gre.c	Sat Jun  8 21:37:51 2002
@@ -120,11 +120,13 @@
 static int ipgre_fb_tunnel_init(struct net_device *dev);
 
 static struct net_device ipgre_fb_tunnel_dev = {
-	"gre0", 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NULL, ipgre_fb_tunnel_init,
+	name:	"gre0",
+	init: 	ipgre_fb_tunnel_init
 };
 
 static struct ip_tunnel ipgre_fb_tunnel = {
-	NULL, &ipgre_fb_tunnel_dev, {0, }, 0, 0, 0, 0, 0, 0, 0, {"gre0", }
+	dev:	&ipgre_fb_tunnel_dev,
+	parms: { name:"gre0"}
 };
 
 /* Tunnel hash table */

Re: [PATCH] Networking: ip_gre init corrected

[David S. Miller]

Patch applied, thanks.