From c82cf5137656244f4c9a85d84a3408b2ee21fcbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 3 Mar 2010 04:01:13 +0000
Subject: [PATCH] --- yaml --- r: 187929 b: refs/heads/master c:
 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3 h: refs/heads/master i:   187927:
 a9cfb2533e9a851cabca99cd9682c96a1b273add v: v3

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

diff --git a/[refs] b/[refs]
index 38e1bfdba7e3..c33e811055d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c839d30a41dd92eb32d7fcfa2b4e99042fc64bf2
+refs/heads/master: 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index c0c5274d0271..f47c9f76754b 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/net/ipv4/ip_gre.c
@@ -1144,12 +1144,9 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
 
 	if (saddr)
 		memcpy(&iph->saddr, saddr, 4);
-
-	if (daddr) {
+	if (daddr)
 		memcpy(&iph->daddr, daddr, 4);
-		return t->hlen;
-	}
-	if (iph->daddr && !ipv4_is_multicast(iph->daddr))
+	if (iph->daddr)
 		return t->hlen;
 
 	return -t->hlen;