Merge branch 'net-fix-netfilter-defrag-ip-tunnel-pmtu-blackhole'

[platform/kernel/linux-rpi.git] / net / ipv6 / ip6_output.c

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index c78e67d..749ad72 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -468,8 +468,6 @@ int ip6_forward(struct sk_buff *skb)
         *      check and decrement ttl
         */
        if (hdr->hop_limit <= 1) {
-               /* Force OUTPUT device used as source address */
-               skb->dev = dst->dev;
                icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT, 0);
                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
 
@@ -1492,7 +1490,7 @@ emsgsize:
         * Otherwise, we need to reserve fragment header and
         * fragment alignment (= 8-15 octects, in total).
         *
-        * Note that we may need to "move" the data from the tail of
+        * Note that we may need to "move" the data from the tail
         * of the buffer to the new fragment when we split
         * the message.
         *
@@ -1615,7 +1613,7 @@ alloc_new_skb:
                        if (fraggap) {
                                skb->csum = skb_copy_and_csum_bits(
                                        skb_prev, maxfraglen,
-                                       data + transhdrlen, fraggap, 0);
+                                       data + transhdrlen, fraggap);
                                skb_prev->csum = csum_sub(skb_prev->csum,
                                                          skb->csum);
                                data += fraggap;