diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 7f6273506eea..179fcab866fc 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1555,9 +1555,9 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1555 | goto out_free; | 1555 | goto out_free; |
1556 | } | 1556 | } |
1557 | 1557 | ||
1558 | dev = rt->u.dst.dev; | 1558 | dev = rt->dst.dev; |
1559 | 1559 | ||
1560 | if (skb->len+encap > dst_mtu(&rt->u.dst) && (ntohs(iph->frag_off) & IP_DF)) { | 1560 | if (skb->len+encap > dst_mtu(&rt->dst) && (ntohs(iph->frag_off) & IP_DF)) { |
1561 | /* Do not fragment multicasts. Alas, IPv4 does not | 1561 | /* Do not fragment multicasts. Alas, IPv4 does not |
1562 | allow to send ICMP, so that packets will disappear | 1562 | allow to send ICMP, so that packets will disappear |
1563 | to blackhole. | 1563 | to blackhole. |
@@ -1568,7 +1568,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1568 | goto out_free; | 1568 | goto out_free; |
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | encap += LL_RESERVED_SPACE(dev) + rt->u.dst.header_len; | 1571 | encap += LL_RESERVED_SPACE(dev) + rt->dst.header_len; |
1572 | 1572 | ||
1573 | if (skb_cow(skb, encap)) { | 1573 | if (skb_cow(skb, encap)) { |
1574 | ip_rt_put(rt); | 1574 | ip_rt_put(rt); |
@@ -1579,7 +1579,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1579 | vif->bytes_out += skb->len; | 1579 | vif->bytes_out += skb->len; |
1580 | 1580 | ||
1581 | skb_dst_drop(skb); | 1581 | skb_dst_drop(skb); |
1582 | skb_dst_set(skb, &rt->u.dst); | 1582 | skb_dst_set(skb, &rt->dst); |
1583 | ip_decrease_ttl(ip_hdr(skb)); | 1583 | ip_decrease_ttl(ip_hdr(skb)); |
1584 | 1584 | ||
1585 | /* FIXME: forward and output firewalls used to be called here. | 1585 | /* FIXME: forward and output firewalls used to be called here. |