From 5dec98f6b52e1e218c36cb861c8076743fa3aa28 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Mon, 29 Nov 2010 09:47:47 +0000
Subject: [PATCH] --- yaml --- r: 224728 b: refs/heads/master c:
 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/ipv4/ip_gre.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7fe6b0ea97ca..02c31fa5ff11 100644
--- 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
index 897210adaa77..98769c399d9e 100644
--- 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);