3 files changed, 50 insertions, 5 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c2c26fa0943d..4da664538f52 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -862,6 +862,8 @@ static int inline ipv6_saddr_label(const struct in6_addr *addr, int type)
   *     2002::/16               2
   *     ::/96                   3
   *     ::ffff:0:0/96           4
+  *     fc00::/7                5
+  *     2001::/32               6
   */
         if (type & IPV6_ADDR_LOOPBACK)
                 return 0;
@@ -869,8 +871,12 @@ static int inline ipv6_saddr_label(const struct in6_addr *addr, int type)
                 return 3;
         else if (type & IPV6_ADDR_MAPPED)
                 return 4;
+        else if (addr->s6_addr32[0] == htonl(0x20010000))
+                return 6;
         else if (addr->s6_addr16[0] == htons(0x2002))
                 return 2;
+        else if ((addr->s6_addr[0] & 0xfe) == 0xfc)
+                return 5;
         return 1;
 }
 
@@ -1069,6 +1075,9 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
                                 if (hiscore.attrs & IPV6_SADDR_SCORE_PRIVACY)
                                         continue;
                         }
+#else
+                        if (hiscore.rule < 7)
+                                hiscore.rule++;
 #endif
                         /* Rule 8: Use longest matching prefix */
                         if (hiscore.rule < 8) {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d29620f4910e..abb94de33768 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -148,7 +148,7 @@ static int ip6_output2(struct sk_buff *skb)
 
 int ip6_output(struct sk_buff *skb)
 {
-        if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->ufo_size) ||
+        if ((skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->gso_size) ||
                                 dst_allfrag(skb->dst))
                 return ip6_fragment(skb, ip6_output2);
         else
@@ -833,8 +833,9 @@ static inline int ip6_ufo_append_data(struct sock *sk,
                 struct frag_hdr fhdr;
 
                 /* specify the length of each IP datagram fragment*/
-                skb_shinfo(skb)->ufo_size = (mtu - fragheaderlen) - 
-                                                sizeof(struct frag_hdr);
+                skb_shinfo(skb)->gso_size = mtu - fragheaderlen - 
+                                            sizeof(struct frag_hdr);
+                skb_shinfo(skb)->gso_type = SKB_GSO_UDPV4;
                 ipv6_select_ident(skb, &fhdr);
                 skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
                 __skb_queue_tail(&sk->sk_write_queue, skb);
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 16e84254a252..48fccb1eca08 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -94,7 +94,7 @@ error_nolock:
         goto out_exit;
 }
 
-static int xfrm6_output_finish(struct sk_buff *skb)
+static int xfrm6_output_finish2(struct sk_buff *skb)
 {
         int err;
 
@@ -110,7 +110,7 @@ static int xfrm6_output_finish(struct sk_buff *skb)
                         return dst_output(skb);
 
                 err = nf_hook(PF_INET6, NF_IP6_POST_ROUTING, &skb, NULL,
-                              skb->dst->dev, xfrm6_output_finish);
+                              skb->dst->dev, xfrm6_output_finish2);
                 if (unlikely(err != 1))
                         break;
         }
@@ -118,6 +118,41 @@ static int xfrm6_output_finish(struct sk_buff *skb)
         return err;
 }
 
+static int xfrm6_output_finish(struct sk_buff *skb)
+{
+        struct sk_buff *segs;
+
+        if (!skb_shinfo(skb)->gso_size)
+                return xfrm6_output_finish2(skb);
+
+        skb->protocol = htons(ETH_P_IP);
+        segs = skb_gso_segment(skb, 0);
+        kfree_skb(skb);
+        if (unlikely(IS_ERR(segs)))
+                return PTR_ERR(segs);
+
+        do {
+                struct sk_buff *nskb = segs->next;
+                int err;
+
+                segs->next = NULL;
+                err = xfrm6_output_finish2(segs);
+
+                if (unlikely(err)) {
+                        while ((segs = nskb)) {
+                                nskb = segs->next;
+                                segs->next = NULL;
+                                kfree_skb(segs);
+                        }
+                        return err;
+                }
+
+                segs = nskb;
+        } while (segs);
+
+        return 0;
+}
+
 int xfrm6_output(struct sk_buff *skb)
 {
         return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,