summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2010-11-29 09:47:47 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-01 12:53:22 -0800
commit407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f (patch)
treea84b9ffc2aa8df98d343aed9c65c4856a4c0cb10 /net/ipv4
parentf2cd2d3e9b3ef960612e362f0ad129d735452df2 (diff)
downloadlinux-stable-407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f.tar.gz
linux-stable-407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f.tar.bz2
linux-stable-407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f.zip
gre: minor cleanups
Use strcpy() rather the sprintf() for the case where name is getting generated. Fix indentation. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 897210adaa77..98769c399d9e 100644
--- a/net/ipv4/ip_gre.c
+++ b/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);