diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-11-29 04:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-01 15:53:22 -0500 |
commit | 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f (patch) | |
tree | a84b9ffc2aa8df98d343aed9c65c4856a4c0cb10 /net/ipv4 | |
parent | f2cd2d3e9b3ef960612e362f0ad129d735452df2 (diff) |
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.c | 4 |
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, | |||
405 | if (parms->name[0]) | 405 | if (parms->name[0]) |
406 | strlcpy(name, parms->name, IFNAMSIZ); | 406 | strlcpy(name, parms->name, IFNAMSIZ); |
407 | else | 407 | else |
408 | sprintf(name, "gre%%d"); | 408 | strcpy(name, "gre%d"); |
409 | 409 | ||
410 | dev = alloc_netdev(sizeof(*t), name, ipgre_tunnel_setup); | 410 | dev = alloc_netdev(sizeof(*t), name, ipgre_tunnel_setup); |
411 | if (!dev) | 411 | if (!dev) |
412 | return NULL; | 412 | return NULL; |
413 | 413 | ||
414 | dev_net_set(dev, net); | 414 | dev_net_set(dev, net); |
415 | 415 | ||