|
@@ -1144,12 +1144,9 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
|
|
if (saddr)
|
|
if (saddr)
|
|
memcpy(&iph->saddr, saddr, 4);
|
|
memcpy(&iph->saddr, saddr, 4);
|
|
-
|
|
|
|
- if (daddr) {
|
|
|
|
|
|
+ if (daddr)
|
|
memcpy(&iph->daddr, daddr, 4);
|
|
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;
|
|
|
|
|
|
return -t->hlen;
|
|
return -t->hlen;
|