---

yaml --- r: 187929 b: refs/heads/master c: 6d55cb9 h: refs/heads/master i: 187927: a9cfb25 v: v3
git-mirror · Mar 4, 2010 · c82cf51 · c82cf51
1 parent 81efb86
commit c82cf51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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;