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 856123fe32f9..8418afc357ee 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1551,9 +1551,9 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1551 | goto out_free; | 1551 | goto out_free; |
1552 | } | 1552 | } |
1553 | 1553 | ||
1554 | dev = rt->u.dst.dev; | 1554 | dev = rt->dst.dev; |
1555 | 1555 | ||
1556 | if (skb->len+encap > dst_mtu(&rt->u.dst) && (ntohs(iph->frag_off) & IP_DF)) { | 1556 | if (skb->len+encap > dst_mtu(&rt->dst) && (ntohs(iph->frag_off) & IP_DF)) { |
1557 | /* Do not fragment multicasts. Alas, IPv4 does not | 1557 | /* Do not fragment multicasts. Alas, IPv4 does not |
1558 | allow to send ICMP, so that packets will disappear | 1558 | allow to send ICMP, so that packets will disappear |
1559 | to blackhole. | 1559 | to blackhole. |
@@ -1564,7 +1564,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1564 | goto out_free; | 1564 | goto out_free; |
1565 | } | 1565 | } |
1566 | 1566 | ||
1567 | encap += LL_RESERVED_SPACE(dev) + rt->u.dst.header_len; | 1567 | encap += LL_RESERVED_SPACE(dev) + rt->dst.header_len; |
1568 | 1568 | ||
1569 | if (skb_cow(skb, encap)) { | 1569 | if (skb_cow(skb, encap)) { |
1570 | ip_rt_put(rt); | 1570 | ip_rt_put(rt); |
@@ -1575,7 +1575,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1575 | vif->bytes_out += skb->len; | 1575 | vif->bytes_out += skb->len; |
1576 | 1576 | ||
1577 | skb_dst_drop(skb); | 1577 | skb_dst_drop(skb); |
1578 | skb_dst_set(skb, &rt->u.dst); | 1578 | skb_dst_set(skb, &rt->dst); |
1579 | ip_decrease_ttl(ip_hdr(skb)); | 1579 | ip_decrease_ttl(ip_hdr(skb)); |
1580 | 1580 | ||
1581 | /* FIXME: forward and output firewalls used to be called here. | 1581 | /* FIXME: forward and output firewalls used to be called here. |