---

yaml --- r: 224728 b: refs/heads/master c: 407d6fc h: refs/heads/master v: v3
git-mirror · Dec 1, 2010 · 5dec98f · 5dec98f
1 parent f61d0d4
commit 5dec98f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2cd2d3e9b3ef960612e362f0ad129d735452df2
+refs/heads/master: 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -405,11 +405,11 @@ static struct ip_tunnel *ipgre_tunnel_locate(struct net *net,
 	if (parms->name[0])
 		strlcpy(name, parms->name, IFNAMSIZ);
 	else
-		sprintf(name, "gre%%d");
+		strcpy(name, "gre%d");
 
 	dev = alloc_netdev(sizeof(*t), name, ipgre_tunnel_setup);
 	if (!dev)
-	  return NULL;
+		return NULL;
 
 	dev_net_set(dev, net);