diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:45 +0100 |
| commit | dafe3258c5449e2697097285c37c761915053eae (patch) | |
| tree | 3132efe10ff5766feae3311993cd7eef7e75d6f3 /net/ipv4/ip_gre.c | |
| parent | 15812f79511f4b94ee42f35c9095ba0c0cb5204c (diff) | |
| parent | 4ed4d44eb2192604716226a6f0edad02ab76101f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-13.09
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 855004f0832..c52fee0976d 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -572,7 +572,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, if (daddr) memcpy(&iph->daddr, daddr, 4); if (iph->daddr) - return t->hlen; + return t->hlen + sizeof(*iph); return -(t->hlen + sizeof(*iph)); } |