From 56a81e9205b112314be9b0198580331e5c42de9e Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sat, 11 Oct 2008 12:20:15 -0700 Subject: [PATCH] --- yaml --- r: 112975 b: refs/heads/master c: 7bb82d924536cfa62db73dd381b07d9e9b084ffa h: refs/heads/master i: 112973: d1d74f505d8d6b60b81b486678e310be29e67481 112971: e0eaa943948ae99cc3b210d35c9156058fd60d1d 112967: 21849b47788f86e1bbbd9eab9a0d9b3cba9c9d0f 112959: 77f0a3c0156da470e2c8285c4ea4604cd6736aa9 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_gre.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aecd10d72539..fb732b77a164 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f901b64472fdabc72eca2b9426fa4e96972b64c4 +refs/heads/master: 7bb82d924536cfa62db73dd381b07d9e9b084ffa diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c index 05ebce2881ef..85c487b8572b 100644 --- a/trunk/net/ipv4/ip_gre.c +++ b/trunk/net/ipv4/ip_gre.c @@ -1345,7 +1345,7 @@ static int ipgre_tap_validate(struct nlattr *tb[], struct nlattr *data[]) static void ipgre_netlink_parms(struct nlattr *data[], struct ip_tunnel_parm *parms) { - memset(parms, 0, sizeof(parms)); + memset(parms, 0, sizeof(*parms)); parms->iph.protocol = IPPROTO_GRE;