Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (448 commits)
  [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
  [IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
  [IPV4]: Add multipath cached to feature-removal-schedule.txt
  [WIRELESS] cfg80211: Clarify locking comment.
  [WIRELESS] cfg80211: Fix locking in wiphy_new.
  [WEXT] net_device: Don't include wext bits if not required.
  [WEXT]: Misc code cleanups.
  [WEXT]: Reduce inline abuse.
  [WEXT]: Move EXPORT_SYMBOL statements where they belong.
  [WEXT]: Cleanup early ioctl call path.
  [WEXT]: Remove options.
  [WEXT]: Remove dead debug code.
  [WEXT]: Clean up how wext is called.
  [WEXT]: Move to net/wireless
  [AFS]: Eliminate cmpxchg() usage in vlocation code.
  [RXRPC]: Fix pointers passed to bitops.
  [RXRPC]: Remove bogus atomic_* overrides.
  [AFS]: Fix u64 printing in debug logging.
  [AFS]: Add "directory write" support.
  [AFS]: Implement the CB.InitCallBackState3 operation.
  ...

1 files changed, 464 insertions, 179 deletions

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 08d944223ec8..a0902fbdb4e1 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1,14 +1,15 @@
 /*
- *      IPv6 over IPv6 tunnel device
+ *      IPv6 tunneling device
  *      Linux INET6 implementation
  *
  *      Authors:
  *      Ville Nuorvala          <vnuorval@tcs.hut.fi>
+ *      Yasuyuki Kozakai        <kozakai@linux-ipv6.org>
  *
  *      $Id$
  *
  *      Based on:
- *      linux/net/ipv6/sit.c
+ *      linux/net/ipv6/sit.c and linux/net/ipv4/ipip.c
  *
  *      RFC 2473
  *
@@ -24,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/sockios.h>
+#include <linux/icmp.h>
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/ip.h>
@@ -41,6 +43,7 @@
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
 
+#include <net/icmp.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
@@ -51,7 +54,7 @@
 #include <net/inet_ecn.h>
 
 MODULE_AUTHOR("Ville Nuorvala");
-MODULE_DESCRIPTION("IPv6-in-IPv6 tunnel");
+MODULE_DESCRIPTION("IPv6 tunneling device");
 MODULE_LICENSE("GPL");
 
 #define IPV6_TLV_TEL_DST_SIZE 8
@@ -63,6 +66,7 @@ MODULE_LICENSE("GPL");
 #endif
 
 #define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK)
+#define IPV6_TCLASS_SHIFT 20
 
 #define HASH_SIZE  32
 
@@ -70,12 +74,12 @@ MODULE_LICENSE("GPL");
                      (addr)->s6_addr32[2] ^ (addr)->s6_addr32[3]) & \
                     (HASH_SIZE - 1))
 
-static int ip6ip6_fb_tnl_dev_init(struct net_device *dev);
-static int ip6ip6_tnl_dev_init(struct net_device *dev);
-static void ip6ip6_tnl_dev_setup(struct net_device *dev);
+static int ip6_fb_tnl_dev_init(struct net_device *dev);
+static int ip6_tnl_dev_init(struct net_device *dev);
+static void ip6_tnl_dev_setup(struct net_device *dev);
 
 /* the IPv6 tunnel fallback device */
-static struct net_device *ip6ip6_fb_tnl_dev;
+static struct net_device *ip6_fb_tnl_dev;
 
 
 /* lists for storing tunnels in use */
@@ -84,7 +88,7 @@ static struct ip6_tnl *tnls_wc[1];
 static struct ip6_tnl **tnls[2] = { tnls_wc, tnls_r_l };
 
 /* lock for the tunnel lists */
-static DEFINE_RWLOCK(ip6ip6_lock);
+static DEFINE_RWLOCK(ip6_tnl_lock);
 
 static inline struct dst_entry *ip6_tnl_dst_check(struct ip6_tnl *t)
 {
@@ -115,7 +119,7 @@ static inline void ip6_tnl_dst_store(struct ip6_tnl *t, struct dst_entry *dst)
 }
 
 /**
- * ip6ip6_tnl_lookup - fetch tunnel matching the end-point addresses
+ * ip6_tnl_lookup - fetch tunnel matching the end-point addresses
  *   @remote: the address of the tunnel exit-point
  *   @local: the address of the tunnel entry-point
  *
@@ -126,7 +130,7 @@ static inline void ip6_tnl_dst_store(struct ip6_tnl *t, struct dst_entry *dst)
  **/
 
 static struct ip6_tnl *
-ip6ip6_tnl_lookup(struct in6_addr *remote, struct in6_addr *local)
+ip6_tnl_lookup(struct in6_addr *remote, struct in6_addr *local)
 {
         unsigned h0 = HASH(remote);
         unsigned h1 = HASH(local);
@@ -145,18 +149,18 @@ ip6ip6_tnl_lookup(struct in6_addr *remote, struct in6_addr *local)
 }
 
 /**
- * ip6ip6_bucket - get head of list matching given tunnel parameters
+ * ip6_tnl_bucket - get head of list matching given tunnel parameters
  *   @p: parameters containing tunnel end-points
  *
  * Description:
- *   ip6ip6_bucket() returns the head of the list matching the
+ *   ip6_tnl_bucket() returns the head of the list matching the
  *   &struct in6_addr entries laddr and raddr in @p.
  *
  * Return: head of IPv6 tunnel list
  **/
 
 static struct ip6_tnl **
-ip6ip6_bucket(struct ip6_tnl_parm *p)
+ip6_tnl_bucket(struct ip6_tnl_parm *p)
 {
         struct in6_addr *remote = &p->raddr;
         struct in6_addr *local = &p->laddr;
@@ -171,36 +175,36 @@ ip6ip6_bucket(struct ip6_tnl_parm *p)
 }
 
 /**
- * ip6ip6_tnl_link - add tunnel to hash table
+ * ip6_tnl_link - add tunnel to hash table
  *   @t: tunnel to be added
  **/
 
 static void
-ip6ip6_tnl_link(struct ip6_tnl *t)
+ip6_tnl_link(struct ip6_tnl *t)
 {
-        struct ip6_tnl **tp = ip6ip6_bucket(&t->parms);
+        struct ip6_tnl **tp = ip6_tnl_bucket(&t->parms);
 
         t->next = *tp;
-        write_lock_bh(&ip6ip6_lock);
+        write_lock_bh(&ip6_tnl_lock);
         *tp = t;
-        write_unlock_bh(&ip6ip6_lock);
+        write_unlock_bh(&ip6_tnl_lock);
 }
 
 /**
- * ip6ip6_tnl_unlink - remove tunnel from hash table
+ * ip6_tnl_unlink - remove tunnel from hash table
  *   @t: tunnel to be removed
  **/
 
 static void
-ip6ip6_tnl_unlink(struct ip6_tnl *t)
+ip6_tnl_unlink(struct ip6_tnl *t)
 {
         struct ip6_tnl **tp;
 
-        for (tp = ip6ip6_bucket(&t->parms); *tp; tp = &(*tp)->next) {
+        for (tp = ip6_tnl_bucket(&t->parms); *tp; tp = &(*tp)->next) {
                 if (t == *tp) {
-                        write_lock_bh(&ip6ip6_lock);
+                        write_lock_bh(&ip6_tnl_lock);
                         *tp = t->next;
-                        write_unlock_bh(&ip6ip6_lock);
+                        write_unlock_bh(&ip6_tnl_lock);
                         break;
                 }
         }
@@ -237,12 +241,12 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p)
                 if (i == IP6_TNL_MAX)
                         goto failed;
         }
-        dev = alloc_netdev(sizeof (*t), name, ip6ip6_tnl_dev_setup);
+        dev = alloc_netdev(sizeof (*t), name, ip6_tnl_dev_setup);
         if (dev == NULL)
                 goto failed;
 
         t = netdev_priv(dev);
-        dev->init = ip6ip6_tnl_dev_init;
+        dev->init = ip6_tnl_dev_init;
         t->parms = *p;
 
         if ((err = register_netdevice(dev)) < 0) {
@@ -250,19 +254,19 @@ static struct ip6_tnl *ip6_tnl_create(struct ip6_tnl_parm *p)
                 goto failed;
         }
         dev_hold(dev);
-        ip6ip6_tnl_link(t);
+        ip6_tnl_link(t);
         return t;
 failed:
         return NULL;
 }
 
 /**
- * ip6ip6_tnl_locate - find or create tunnel matching given parameters
+ * ip6_tnl_locate - find or create tunnel matching given parameters
  *   @p: tunnel parameters
  *   @create: != 0 if allowed to create new tunnel if no match found
  *
  * Description:
- *   ip6ip6_tnl_locate() first tries to locate an existing tunnel
+ *   ip6_tnl_locate() first tries to locate an existing tunnel
  *   based on @parms. If this is unsuccessful, but @create is set a new
  *   tunnel device is created and registered for use.
  *
@@ -270,13 +274,13 @@ failed:
  *   matching tunnel or NULL
  **/
 
-static struct ip6_tnl *ip6ip6_tnl_locate(struct ip6_tnl_parm *p, int create)
+static struct ip6_tnl *ip6_tnl_locate(struct ip6_tnl_parm *p, int create)
 {
         struct in6_addr *remote = &p->raddr;
         struct in6_addr *local = &p->laddr;
         struct ip6_tnl *t;
 
-        for (t = *ip6ip6_bucket(p); t; t = t->next) {
+        for (t = *ip6_tnl_bucket(p); t; t = t->next) {
                 if (ipv6_addr_equal(local, &t->parms.laddr) &&
                     ipv6_addr_equal(remote, &t->parms.raddr))
                         return t;
@@ -287,24 +291,24 @@ static struct ip6_tnl *ip6ip6_tnl_locate(struct ip6_tnl_parm *p, int create)
 }
 
 /**
- * ip6ip6_tnl_dev_uninit - tunnel device uninitializer
+ * ip6_tnl_dev_uninit - tunnel device uninitializer
  *   @dev: the device to be destroyed
  *
  * Description:
- *   ip6ip6_tnl_dev_uninit() removes tunnel from its list
+ *   ip6_tnl_dev_uninit() removes tunnel from its list
  **/
 
 static void
-ip6ip6_tnl_dev_uninit(struct net_device *dev)
+ip6_tnl_dev_uninit(struct net_device *dev)
 {
         struct ip6_tnl *t = netdev_priv(dev);
 
-        if (dev == ip6ip6_fb_tnl_dev) {
-                write_lock_bh(&ip6ip6_lock);
+        if (dev == ip6_fb_tnl_dev) {
+                write_lock_bh(&ip6_tnl_lock);
                 tnls_wc[0] = NULL;
-                write_unlock_bh(&ip6ip6_lock);
+                write_unlock_bh(&ip6_tnl_lock);
         } else {
-                ip6ip6_tnl_unlink(t);
+                ip6_tnl_unlink(t);
         }
         ip6_tnl_dst_reset(t);
         dev_put(dev);
@@ -372,16 +376,16 @@ parse_tlv_tnl_enc_lim(struct sk_buff *skb, __u8 * raw)
 }
 
 /**
- * ip6ip6_err - tunnel error handler
+ * ip6_tnl_err - tunnel error handler
  *
  * Description:
- *   ip6ip6_err() should handle errors in the tunnel according
+ *   ip6_tnl_err() should handle errors in the tunnel according
  *   to the specifications in RFC 2473.
  **/
 
 static int
-ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
-           int type, int code, int offset, __be32 info)
+ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
+            int *type, int *code, int *msg, __be32 *info, int offset)
 {
         struct ipv6hdr *ipv6h = (struct ipv6hdr *) skb->data;
         struct ip6_tnl *t;
@@ -396,13 +400,16 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
            in trouble since we might need the source address for further
            processing of the error. */
 
-        read_lock(&ip6ip6_lock);
-        if ((t = ip6ip6_tnl_lookup(&ipv6h->daddr, &ipv6h->saddr)) == NULL)
+        read_lock(&ip6_tnl_lock);
+        if ((t = ip6_tnl_lookup(&ipv6h->daddr, &ipv6h->saddr)) == NULL)
+                goto out;
+
+        if (t->parms.proto != ipproto && t->parms.proto != 0)
                 goto out;
 
         err = 0;
 
-        switch (type) {
+        switch (*type) {
                 __u32 teli;
                 struct ipv6_tlv_tnl_enc_lim *tel;
                 __u32 mtu;
@@ -414,7 +421,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 rel_msg = 1;
                 break;
         case ICMPV6_TIME_EXCEED:
-                if (code == ICMPV6_EXC_HOPLIMIT) {
+                if ((*code) == ICMPV6_EXC_HOPLIMIT) {
                         if (net_ratelimit())
                                 printk(KERN_WARNING
                                        "%s: Too small hop limit or "
@@ -425,10 +432,10 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 break;
         case ICMPV6_PARAMPROB:
                 teli = 0;
-                if (code == ICMPV6_HDR_FIELD)
+                if ((*code) == ICMPV6_HDR_FIELD)
                         teli = parse_tlv_tnl_enc_lim(skb, skb->data);
 
-                if (teli && teli == ntohl(info) - 2) {
+                if (teli && teli == ntohl(*info) - 2) {
                         tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli];
                         if (tel->encap_limit == 0) {
                                 if (net_ratelimit())
@@ -445,7 +452,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 }
                 break;
         case ICMPV6_PKT_TOOBIG:
-                mtu = ntohl(info) - offset;
+                mtu = ntohl(*info) - offset;
                 if (mtu < IPV6_MIN_MTU)
                         mtu = IPV6_MIN_MTU;
                 t->dev->mtu = mtu;
@@ -458,20 +465,144 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 }
                 break;
         }
-        if (rel_msg &&  pskb_may_pull(skb, offset + sizeof (*ipv6h))) {
+
+        *type = rel_type;
+        *code = rel_code;
+        *info = rel_info;
+        *msg = rel_msg;
+
+out:
+        read_unlock(&ip6_tnl_lock);
+        return err;
+}
+
+static int
+ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+           int type, int code, int offset, __u32 info)
+{
+        int rel_msg = 0;
+        int rel_type = type;
+        int rel_code = code;
+        __u32 rel_info = info;
+        int err;
+        struct sk_buff *skb2;
+        struct iphdr *eiph;
+        struct flowi fl;
+        struct rtable *rt;
+
+        err = ip6_tnl_err(skb, IPPROTO_IPIP, opt, &rel_type, &rel_code,
+                          &rel_msg, &rel_info, offset);
+        if (err < 0)
+                return err;
+
+        if (rel_msg == 0)
+                return 0;
+
+        switch (rel_type) {
+        case ICMPV6_DEST_UNREACH:
+                if (rel_code != ICMPV6_ADDR_UNREACH)
+                        return 0;
+                rel_type = ICMP_DEST_UNREACH;
+                rel_code = ICMP_HOST_UNREACH;
+                break;
+        case ICMPV6_PKT_TOOBIG:
+                if (rel_code != 0)
+                        return 0;
+                rel_type = ICMP_DEST_UNREACH;
+                rel_code = ICMP_FRAG_NEEDED;
+                break;
+        default:
+                return 0;
+        }
+
+        if (!pskb_may_pull(skb, offset + sizeof(struct iphdr)))
+                return 0;
+
+        skb2 = skb_clone(skb, GFP_ATOMIC);
+        if (!skb2)
+                return 0;
+
+        dst_release(skb2->dst);
+        skb2->dst = NULL;
+        skb_pull(skb2, offset);
+        skb_reset_network_header(skb2);
+        eiph = ip_hdr(skb2);
+
+        /* Try to guess incoming interface */
+        memset(&fl, 0, sizeof(fl));
+        fl.fl4_dst = eiph->saddr;
+        fl.fl4_tos = RT_TOS(eiph->tos);
+        fl.proto = IPPROTO_IPIP;
+        if (ip_route_output_key(&rt, &fl))
+                goto out;
+
+        skb2->dev = rt->u.dst.dev;
+
+        /* route "incoming" packet */
+        if (rt->rt_flags & RTCF_LOCAL) {
+                ip_rt_put(rt);
+                rt = NULL;
+                fl.fl4_dst = eiph->daddr;
+                fl.fl4_src = eiph->saddr;
+                fl.fl4_tos = eiph->tos;
+                if (ip_route_output_key(&rt, &fl) ||
+                    rt->u.dst.dev->type != ARPHRD_TUNNEL) {
+                        ip_rt_put(rt);
+                        goto out;
+                }
+        } else {
+                ip_rt_put(rt);
+                if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos,
+                                   skb2->dev) ||
+                    skb2->dst->dev->type != ARPHRD_TUNNEL)
+                        goto out;
+        }
+
+        /* change mtu on this route */
+        if (rel_type == ICMP_DEST_UNREACH && rel_code == ICMP_FRAG_NEEDED) {
+                if (rel_info > dst_mtu(skb2->dst))
+                        goto out;
+
+                skb2->dst->ops->update_pmtu(skb2->dst, rel_info);
+                rel_info = htonl(rel_info);
+        }
+
+        icmp_send(skb2, rel_type, rel_code, rel_info);
+
+out:
+        kfree_skb(skb2);
+        return 0;
+}
+
+static int
+ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+           int type, int code, int offset, __u32 info)
+{
+        int rel_msg = 0;
+        int rel_type = type;
+        int rel_code = code;
+        __u32 rel_info = info;
+        int err;
+
+        err = ip6_tnl_err(skb, IPPROTO_IPV6, opt, &rel_type, &rel_code,
+                          &rel_msg, &rel_info, offset);
+        if (err < 0)
+                return err;
+
+        if (rel_msg && pskb_may_pull(skb, offset + sizeof(struct ipv6hdr))) {
                 struct rt6_info *rt;
                 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
 
                 if (!skb2)
-                        goto out;
+                        return 0;
 
                 dst_release(skb2->dst);
                 skb2->dst = NULL;
                 skb_pull(skb2, offset);
-                skb2->nh.raw = skb2->data;
+                skb_reset_network_header(skb2);
 
                 /* Try to guess incoming interface */
-                rt = rt6_lookup(&skb2->nh.ipv6h->saddr, NULL, 0, 0);
+                rt = rt6_lookup(&ipv6_hdr(skb2)->saddr, NULL, 0, 0);
 
                 if (rt && rt->rt6i_dev)
                         skb2->dev = rt->rt6i_dev;
@@ -483,19 +614,34 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
                 kfree_skb(skb2);
         }
-out:
-        read_unlock(&ip6ip6_lock);
-        return err;
+
+        return 0;
 }
 
-static inline void ip6ip6_ecn_decapsulate(struct ipv6hdr *outer_iph,
-                                          struct sk_buff *skb)
+static void ip4ip6_dscp_ecn_decapsulate(struct ip6_tnl *t,
+                                        struct ipv6hdr *ipv6h,
+                                        struct sk_buff *skb)
 {
-        struct ipv6hdr *inner_iph = skb->nh.ipv6h;
+        __u8 dsfield = ipv6_get_dsfield(ipv6h) & ~INET_ECN_MASK;
 
-        if (INET_ECN_is_ce(ipv6_get_dsfield(outer_iph)))
-                IP6_ECN_set_ce(inner_iph);
+        if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY)
+                ipv4_change_dsfield(ip_hdr(skb), INET_ECN_MASK, dsfield);
+
+        if (INET_ECN_is_ce(dsfield))
+                IP_ECN_set_ce(ip_hdr(skb));
+}
+
+static void ip6ip6_dscp_ecn_decapsulate(struct ip6_tnl *t,
+                                        struct ipv6hdr *ipv6h,
+                                        struct sk_buff *skb)
+{
+        if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY)
+                ipv6_copy_dscp(ipv6h, ipv6_hdr(skb));
+
+        if (INET_ECN_is_ce(ipv6_get_dsfield(ipv6h)))
+                IP6_ECN_set_ce(ipv6_hdr(skb));
 }
+
 static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t)
 {
         struct ip6_tnl_parm *p = &t->parms;
@@ -519,53 +665,61 @@ static inline int ip6_tnl_rcv_ctl(struct ip6_tnl *t)
 }
 
 /**
- * ip6ip6_rcv - decapsulate IPv6 packet and retransmit it locally
+ * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
  *   @skb: received socket buffer
+ *   @protocol: ethernet protocol ID
+ *   @dscp_ecn_decapsulate: the function to decapsulate DSCP code and ECN
  *
  * Return: 0
  **/
 
-static int
-ip6ip6_rcv(struct sk_buff *skb)
+static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
+                       __u8 ipproto,
+                       void (*dscp_ecn_decapsulate)(struct ip6_tnl *t,
+                                                    struct ipv6hdr *ipv6h,
+                                                    struct sk_buff *skb))
 {
-        struct ipv6hdr *ipv6h;
         struct ip6_tnl *t;
+        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
 
-        ipv6h = skb->nh.ipv6h;
+        read_lock(&ip6_tnl_lock);
 
-        read_lock(&ip6ip6_lock);
+        if ((t = ip6_tnl_lookup(&ipv6h->saddr, &ipv6h->daddr)) != NULL) {
+                if (t->parms.proto != ipproto && t->parms.proto != 0) {
+                        read_unlock(&ip6_tnl_lock);
+                        goto discard;
+                }
 
-        if ((t = ip6ip6_tnl_lookup(&ipv6h->saddr, &ipv6h->daddr)) != NULL) {
                 if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
-                        read_unlock(&ip6ip6_lock);
+                        read_unlock(&ip6_tnl_lock);
                         goto discard;
                 }
 
                 if (!ip6_tnl_rcv_ctl(t)) {
                         t->stat.rx_dropped++;
-                        read_unlock(&ip6ip6_lock);
+                        read_unlock(&ip6_tnl_lock);
                         goto discard;
                 }
                 secpath_reset(skb);
-                skb->mac.raw = skb->nh.raw;
-                skb->nh.raw = skb->data;
-                skb->protocol = htons(ETH_P_IPV6);
+                skb->mac_header = skb->network_header;
+                skb_reset_network_header(skb);
+                skb->protocol = htons(protocol);
                 skb->pkt_type = PACKET_HOST;
                 memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
                 skb->dev = t->dev;
                 dst_release(skb->dst);
                 skb->dst = NULL;
                 nf_reset(skb);
-                if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY)
-                        ipv6_copy_dscp(ipv6h, skb->nh.ipv6h);
-                ip6ip6_ecn_decapsulate(ipv6h, skb);
+
+                dscp_ecn_decapsulate(t, ipv6h, skb);
+
                 t->stat.rx_packets++;
                 t->stat.rx_bytes += skb->len;
                 netif_rx(skb);
-                read_unlock(&ip6ip6_lock);
+                read_unlock(&ip6_tnl_lock);
                 return 0;
         }
-        read_unlock(&ip6ip6_lock);
+        read_unlock(&ip6_tnl_lock);
         return 1;
 
 discard:
@@ -573,6 +727,18 @@ discard:
         return 0;
 }
 
+static int ip4ip6_rcv(struct sk_buff *skb)
+{
+        return ip6_tnl_rcv(skb, ETH_P_IP, IPPROTO_IPIP,
+                           ip4ip6_dscp_ecn_decapsulate);
+}
+
+static int ip6ip6_rcv(struct sk_buff *skb)
+{
+        return ip6_tnl_rcv(skb, ETH_P_IPV6, IPPROTO_IPV6,
+                           ip6ip6_dscp_ecn_decapsulate);
+}
+
 struct ipv6_tel_txoption {
         struct ipv6_txoptions ops;
         __u8 dst_opt[8];
@@ -593,7 +759,7 @@ static void init_tel_txopt(struct ipv6_tel_txoption *opt, __u8 encap_limit)
 }
 
 /**
- * ip6ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
+ * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own
  *   @t: the outgoing tunnel device
  *   @hdr: IPv6 header from the incoming packet
  *
@@ -607,7 +773,7 @@ static void init_tel_txopt(struct ipv6_tel_txoption *opt, __u8 encap_limit)
  **/
 
 static inline int
-ip6ip6_tnl_addr_conflict(struct ip6_tnl *t, struct ipv6hdr *hdr)
+ip6_tnl_addr_conflict(struct ip6_tnl *t, struct ipv6hdr *hdr)
 {
         return ipv6_addr_equal(&t->parms.raddr, &hdr->saddr);
 }
@@ -641,72 +807,49 @@ static inline int ip6_tnl_xmit_ctl(struct ip6_tnl *t)
         return ret;
 }
 /**
- * ip6ip6_tnl_xmit - encapsulate packet and send
+ * ip6_tnl_xmit2 - encapsulate packet and send
  *   @skb: the outgoing socket buffer
  *   @dev: the outgoing tunnel device
+ *   @dsfield: dscp code for outer header
+ *   @fl: flow of tunneled packet
+ *   @encap_limit: encapsulation limit
+ *   @pmtu: Path MTU is stored if packet is too big
  *
  * Description:
  *   Build new header and do some sanity checks on the packet before sending
  *   it.
  *
  * Return:
- *   0
+ *   0 on success
+ *   -1 fail
+ *   %-EMSGSIZE message too big. return mtu in this case.
  **/
 
-static int
-ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
+static int ip6_tnl_xmit2(struct sk_buff *skb,
+                         struct net_device *dev,
+                         __u8 dsfield,
+                         struct flowi *fl,
+                         int encap_limit,
+                         __u32 *pmtu)
 {
         struct ip6_tnl *t = netdev_priv(dev);
         struct net_device_stats *stats = &t->stat;
-        struct ipv6hdr *ipv6h = skb->nh.ipv6h;
-        int encap_limit = -1;
+        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
         struct ipv6_tel_txoption opt;
-        __u16 offset;
-        struct flowi fl;
         struct dst_entry *dst;
         struct net_device *tdev;
         int mtu;
         int max_headroom = sizeof(struct ipv6hdr);
         u8 proto;
-        int err;
+        int err = -1;
         int pkt_len;
-        int dsfield;
-
-        if (t->recursion++) {
-                stats->collisions++;
-                goto tx_err;
-        }
-        if (skb->protocol != htons(ETH_P_IPV6) ||
-            !ip6_tnl_xmit_ctl(t) || ip6ip6_tnl_addr_conflict(t, ipv6h))
-                goto tx_err;
-
-        if ((offset = parse_tlv_tnl_enc_lim(skb, skb->nh.raw)) > 0) {
-                struct ipv6_tlv_tnl_enc_lim *tel;
-                tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->nh.raw[offset];
-                if (tel->encap_limit == 0) {
-                        icmpv6_send(skb, ICMPV6_PARAMPROB,
-                                    ICMPV6_HDR_FIELD, offset + 2, skb->dev);
-                        goto tx_err;
-                }
-                encap_limit = tel->encap_limit - 1;
-        } else if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
-                encap_limit = t->parms.encap_limit;
-
-        memcpy(&fl, &t->fl, sizeof (fl));
-        proto = fl.proto;
-
-        dsfield = ipv6_get_dsfield(ipv6h);
-        if ((t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS))
-                fl.fl6_flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
-        if ((t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL))
-                fl.fl6_flowlabel |= (*(__be32 *) ipv6h & IPV6_FLOWLABEL_MASK);
 
         if ((dst = ip6_tnl_dst_check(t)) != NULL)
                 dst_hold(dst);
         else {
-                dst = ip6_route_output(NULL, &fl);
+                dst = ip6_route_output(NULL, fl);
 
-                if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0)
+                if (dst->error || xfrm_lookup(&dst, fl, NULL, 0) < 0)
                         goto tx_err_link_failure;
         }
 
@@ -730,7 +873,8 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
         if (skb->dst)
                 skb->dst->ops->update_pmtu(skb->dst, mtu);
         if (skb->len > mtu) {
-                icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev);
+                *pmtu = mtu;
+                err = -EMSGSIZE;
                 goto tx_err_dst_release;
         }
 
@@ -754,22 +898,24 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
         dst_release(skb->dst);
         skb->dst = dst_clone(dst);
 
-        skb->h.raw = skb->nh.raw;
+        skb->transport_header = skb->network_header;
 
+        proto = fl->proto;
         if (encap_limit >= 0) {
                 init_tel_txopt(&opt, encap_limit);
                 ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
         }
-        skb->nh.raw = skb_push(skb, sizeof(struct ipv6hdr));
-        ipv6h = skb->nh.ipv6h;
-        *(__be32*)ipv6h = fl.fl6_flowlabel | htonl(0x60000000);
+        skb_push(skb, sizeof(struct ipv6hdr));
+        skb_reset_network_header(skb);
+        ipv6h = ipv6_hdr(skb);
+        *(__be32*)ipv6h = fl->fl6_flowlabel | htonl(0x60000000);
         dsfield = INET_ECN_encapsulate(0, dsfield);
         ipv6_change_dsfield(ipv6h, ~INET_ECN_MASK, dsfield);
         ipv6h->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
         ipv6h->hop_limit = t->parms.hop_limit;
         ipv6h->nexthdr = proto;
-        ipv6_addr_copy(&ipv6h->saddr, &fl.fl6_src);
-        ipv6_addr_copy(&ipv6h->daddr, &fl.fl6_dst);
+        ipv6_addr_copy(&ipv6h->saddr, &fl->fl6_src);
+        ipv6_addr_copy(&ipv6h->daddr, &fl->fl6_dst);
         nf_reset(skb);
         pkt_len = skb->len;
         err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL,
@@ -783,13 +929,131 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
                 stats->tx_aborted_errors++;
         }
         ip6_tnl_dst_store(t, dst);
-        t->recursion--;
         return 0;
 tx_err_link_failure:
         stats->tx_carrier_errors++;
         dst_link_failure(skb);
 tx_err_dst_release:
         dst_release(dst);
+        return err;
+}
+
+static inline int
+ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct ip6_tnl *t = netdev_priv(dev);
+        struct iphdr  *iph = ip_hdr(skb);
+        int encap_limit = -1;
+        struct flowi fl;
+        __u8 dsfield;
+        __u32 mtu;
+        int err;
+
+        if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
+            !ip6_tnl_xmit_ctl(t))
+                return -1;
+
+        if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
+                encap_limit = t->parms.encap_limit;
+
+        memcpy(&fl, &t->fl, sizeof (fl));
+        fl.proto = IPPROTO_IPIP;
+
+        dsfield = ipv4_get_dsfield(iph);
+
+        if ((t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS))
+                fl.fl6_flowlabel |= ntohl(((__u32)iph->tos << IPV6_TCLASS_SHIFT)
+                                          & IPV6_TCLASS_MASK);
+
+        err = ip6_tnl_xmit2(skb, dev, dsfield, &fl, encap_limit, &mtu);
+        if (err != 0) {
+                /* XXX: send ICMP error even if DF is not set. */
+                if (err == -EMSGSIZE)
+                        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
+                                  htonl(mtu));
+                return -1;
+        }
+
+        return 0;
+}
+
+static inline int
+ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct ip6_tnl *t = netdev_priv(dev);
+        struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+        int encap_limit = -1;
+        __u16 offset;
+        struct flowi fl;
+        __u8 dsfield;
+        __u32 mtu;
+        int err;
+
+        if ((t->parms.proto != IPPROTO_IPV6 && t->parms.proto != 0) ||
+            !ip6_tnl_xmit_ctl(t) || ip6_tnl_addr_conflict(t, ipv6h))
+                return -1;
+
+        offset = parse_tlv_tnl_enc_lim(skb, skb_network_header(skb));
+        if (offset > 0) {
+                struct ipv6_tlv_tnl_enc_lim *tel;
+                tel = (struct ipv6_tlv_tnl_enc_lim *)&skb_network_header(skb)[offset];
+                if (tel->encap_limit == 0) {
+                        icmpv6_send(skb, ICMPV6_PARAMPROB,
+                                    ICMPV6_HDR_FIELD, offset + 2, skb->dev);
+                        return -1;
+                }
+                encap_limit = tel->encap_limit - 1;
+        } else if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
+                encap_limit = t->parms.encap_limit;
+
+        memcpy(&fl, &t->fl, sizeof (fl));
+        fl.proto = IPPROTO_IPV6;
+
+        dsfield = ipv6_get_dsfield(ipv6h);
+        if ((t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS))
+                fl.fl6_flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
+        if ((t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL))
+                fl.fl6_flowlabel |= (*(__be32 *) ipv6h & IPV6_FLOWLABEL_MASK);
+
+        err = ip6_tnl_xmit2(skb, dev, dsfield, &fl, encap_limit, &mtu);
+        if (err != 0) {
+                if (err == -EMSGSIZE)
+                        icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev);
+                return -1;
+        }
+
+        return 0;
+}
+
+static int
+ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct ip6_tnl *t = netdev_priv(dev);
+        struct net_device_stats *stats = &t->stat;
+        int ret;
+
+        if (t->recursion++) {
+                t->stat.collisions++;
+                goto tx_err;
+        }
+
+        switch (skb->protocol) {
+        case __constant_htons(ETH_P_IP):
+                ret = ip4ip6_tnl_xmit(skb, dev);
+                break;
+        case __constant_htons(ETH_P_IPV6):
+                ret = ip6ip6_tnl_xmit(skb, dev);
+                break;
+        default:
+                goto tx_err;
+        }
+
+        if (ret < 0)
+                goto tx_err;
+
+        t->recursion--;
+        return 0;
+
 tx_err:
         stats->tx_errors++;
         stats->tx_dropped++;
@@ -817,7 +1081,7 @@ static void ip6_tnl_set_cap(struct ip6_tnl *t)
         }
 }
 
-static void ip6ip6_tnl_link_config(struct ip6_tnl *t)
+static void ip6_tnl_link_config(struct ip6_tnl *t)
 {
         struct net_device *dev = t->dev;
         struct ip6_tnl_parm *p = &t->parms;
@@ -870,17 +1134,17 @@ static void ip6ip6_tnl_link_config(struct ip6_tnl *t)
 }
 
 /**
- * ip6ip6_tnl_change - update the tunnel parameters
+ * ip6_tnl_change - update the tunnel parameters
  *   @t: tunnel to be changed
  *   @p: tunnel configuration parameters
  *   @active: != 0 if tunnel is ready for use
  *
  * Description:
- *   ip6ip6_tnl_change() updates the tunnel parameters
+ *   ip6_tnl_change() updates the tunnel parameters
  **/
 
 static int
-ip6ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p)
+ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p)
 {
         ipv6_addr_copy(&t->parms.laddr, &p->laddr);
         ipv6_addr_copy(&t->parms.raddr, &p->raddr);
@@ -889,19 +1153,20 @@ ip6ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p)
         t->parms.encap_limit = p->encap_limit;
         t->parms.flowinfo = p->flowinfo;
         t->parms.link = p->link;
+        t->parms.proto = p->proto;
         ip6_tnl_dst_reset(t);
-        ip6ip6_tnl_link_config(t);
+        ip6_tnl_link_config(t);
         return 0;
 }
 
 /**
- * ip6ip6_tnl_ioctl - configure ipv6 tunnels from userspace
+ * ip6_tnl_ioctl - configure ipv6 tunnels from userspace
  *   @dev: virtual device associated with tunnel
  *   @ifr: parameters passed from userspace
  *   @cmd: command to be performed
  *
  * Description:
- *   ip6ip6_tnl_ioctl() is used for managing IPv6 tunnels
+ *   ip6_tnl_ioctl() is used for managing IPv6 tunnels
  *   from userspace.
  *
  *   The possible commands are the following:
@@ -923,7 +1188,7 @@ ip6ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p)
  **/
 
 static int
-ip6ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         int err = 0;
         struct ip6_tnl_parm p;
@@ -931,12 +1196,12 @@ ip6ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
         switch (cmd) {
         case SIOCGETTUNNEL:
-                if (dev == ip6ip6_fb_tnl_dev) {
+                if (dev == ip6_fb_tnl_dev) {
                         if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof (p))) {
                                 err = -EFAULT;
                                 break;
                         }
-                        t = ip6ip6_tnl_locate(&p, 0);
+                        t = ip6_tnl_locate(&p, 0);
                 }
                 if (t == NULL)
                         t = netdev_priv(dev);
@@ -954,10 +1219,11 @@ ip6ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof (p)))
                         break;
                 err = -EINVAL;
-                if (p.proto != IPPROTO_IPV6)
+                if (p.proto != IPPROTO_IPV6 && p.proto != IPPROTO_IPIP &&
+                    p.proto != 0)
                         break;
-                t = ip6ip6_tnl_locate(&p, cmd == SIOCADDTUNNEL);
-                if (dev != ip6ip6_fb_tnl_dev && cmd == SIOCCHGTUNNEL) {
+                t = ip6_tnl_locate(&p, cmd == SIOCADDTUNNEL);
+                if (dev != ip6_fb_tnl_dev && cmd == SIOCCHGTUNNEL) {
                         if (t != NULL) {
                                 if (t->dev != dev) {
                                         err = -EEXIST;
@@ -966,9 +1232,9 @@ ip6ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         } else
                                 t = netdev_priv(dev);
 
-                        ip6ip6_tnl_unlink(t);
-                        err = ip6ip6_tnl_change(t, &p);
-                        ip6ip6_tnl_link(t);
+                        ip6_tnl_unlink(t);
+                        err = ip6_tnl_change(t, &p);
+                        ip6_tnl_link(t);
                         netdev_state_change(dev);
                 }
                 if (t) {
@@ -984,15 +1250,15 @@ ip6ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (!capable(CAP_NET_ADMIN))
                         break;
 
-                if (dev == ip6ip6_fb_tnl_dev) {
+                if (dev == ip6_fb_tnl_dev) {
                         err = -EFAULT;
                         if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof (p)))
                                 break;
                         err = -ENOENT;
-                        if ((t = ip6ip6_tnl_locate(&p, 0)) == NULL)
+                        if ((t = ip6_tnl_locate(&p, 0)) == NULL)
                                 break;
                         err = -EPERM;
-                        if (t->dev == ip6ip6_fb_tnl_dev)
+                        if (t->dev == ip6_fb_tnl_dev)
                                 break;
                         dev = t->dev;
                 }
@@ -1006,20 +1272,20 @@ ip6ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 }
 
 /**
- * ip6ip6_tnl_get_stats - return the stats for tunnel device
+ * ip6_tnl_get_stats - return the stats for tunnel device
  *   @dev: virtual device associated with tunnel
  *
  * Return: stats for device
  **/
 
 static struct net_device_stats *
-ip6ip6_tnl_get_stats(struct net_device *dev)
+ip6_tnl_get_stats(struct net_device *dev)
 {
         return &(((struct ip6_tnl *)netdev_priv(dev))->stat);
 }
 
 /**
- * ip6ip6_tnl_change_mtu - change mtu manually for tunnel device
+ * ip6_tnl_change_mtu - change mtu manually for tunnel device
  *   @dev: virtual device associated with tunnel
  *   @new_mtu: the new mtu
  *
@@ -1029,7 +1295,7 @@ ip6ip6_tnl_get_stats(struct net_device *dev)
  **/
 
 static int
-ip6ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)
+ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)
 {
         if (new_mtu < IPV6_MIN_MTU) {
                 return -EINVAL;
@@ -1039,22 +1305,22 @@ ip6ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)
 }
 
 /**
- * ip6ip6_tnl_dev_setup - setup virtual tunnel device
+ * ip6_tnl_dev_setup - setup virtual tunnel device
  *   @dev: virtual device associated with tunnel
  *
  * Description:
  *   Initialize function pointers and device parameters
  **/
 
-static void ip6ip6_tnl_dev_setup(struct net_device *dev)
+static void ip6_tnl_dev_setup(struct net_device *dev)
 {
         SET_MODULE_OWNER(dev);
-        dev->uninit = ip6ip6_tnl_dev_uninit;
+        dev->uninit = ip6_tnl_dev_uninit;
         dev->destructor = free_netdev;
-        dev->hard_start_xmit = ip6ip6_tnl_xmit;
-        dev->get_stats = ip6ip6_tnl_get_stats;
-        dev->do_ioctl = ip6ip6_tnl_ioctl;
-        dev->change_mtu = ip6ip6_tnl_change_mtu;
+        dev->hard_start_xmit = ip6_tnl_xmit;
+        dev->get_stats = ip6_tnl_get_stats;
+        dev->do_ioctl = ip6_tnl_ioctl;
+        dev->change_mtu = ip6_tnl_change_mtu;
 
         dev->type = ARPHRD_TUNNEL6;
         dev->hard_header_len = LL_MAX_HEADER + sizeof (struct ipv6hdr);
@@ -1065,50 +1331,56 @@ static void ip6ip6_tnl_dev_setup(struct net_device *dev)
 
 
 /**
- * ip6ip6_tnl_dev_init_gen - general initializer for all tunnel devices
+ * ip6_tnl_dev_init_gen - general initializer for all tunnel devices
  *   @dev: virtual device associated with tunnel
  **/
 
 static inline void
-ip6ip6_tnl_dev_init_gen(struct net_device *dev)
+ip6_tnl_dev_init_gen(struct net_device *dev)
 {
         struct ip6_tnl *t = netdev_priv(dev);
-        t->fl.proto = IPPROTO_IPV6;
         t->dev = dev;
         strcpy(t->parms.name, dev->name);
 }
 
 /**
- * ip6ip6_tnl_dev_init - initializer for all non fallback tunnel devices
+ * ip6_tnl_dev_init - initializer for all non fallback tunnel devices
  *   @dev: virtual device associated with tunnel
  **/
 
 static int
-ip6ip6_tnl_dev_init(struct net_device *dev)
+ip6_tnl_dev_init(struct net_device *dev)
 {
         struct ip6_tnl *t = netdev_priv(dev);
-        ip6ip6_tnl_dev_init_gen(dev);
-        ip6ip6_tnl_link_config(t);
+        ip6_tnl_dev_init_gen(dev);
+        ip6_tnl_link_config(t);
         return 0;
 }
 
 /**
- * ip6ip6_fb_tnl_dev_init - initializer for fallback tunnel device
+ * ip6_fb_tnl_dev_init - initializer for fallback tunnel device
  *   @dev: fallback device
  *
  * Return: 0
  **/
 
 static int
-ip6ip6_fb_tnl_dev_init(struct net_device *dev)
+ip6_fb_tnl_dev_init(struct net_device *dev)
 {
         struct ip6_tnl *t = netdev_priv(dev);
-        ip6ip6_tnl_dev_init_gen(dev);
+        ip6_tnl_dev_init_gen(dev);
+        t->parms.proto = IPPROTO_IPV6;
         dev_hold(dev);
         tnls_wc[0] = t;
         return 0;
 }
 
+static struct xfrm6_tunnel ip4ip6_handler = {
+        .handler        = ip4ip6_rcv,
+        .err_handler    = ip4ip6_err,
+        .priority       =       1,
+};
+
 static struct xfrm6_tunnel ip6ip6_handler = {
         .handler        = ip6ip6_rcv,
         .err_handler    = ip6ip6_err,
@@ -1125,30 +1397,40 @@ static int __init ip6_tunnel_init(void)
 {
         int  err;
 
+        if (xfrm6_tunnel_register(&ip4ip6_handler, AF_INET)) {
+                printk(KERN_ERR "ip6_tunnel init: can't register ip4ip6\n");
+                err = -EAGAIN;
+                goto out;
+        }
+
         if (xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6)) {
-                printk(KERN_ERR "ip6ip6 init: can't register tunnel\n");
-                return -EAGAIN;
+                printk(KERN_ERR "ip6_tunnel init: can't register ip6ip6\n");
+                err = -EAGAIN;
+                goto unreg_ip4ip6;
         }
-        ip6ip6_fb_tnl_dev = alloc_netdev(sizeof(struct ip6_tnl), "ip6tnl0",
-                                         ip6ip6_tnl_dev_setup);
+        ip6_fb_tnl_dev = alloc_netdev(sizeof(struct ip6_tnl), "ip6tnl0",
+                                      ip6_tnl_dev_setup);
 
-        if (!ip6ip6_fb_tnl_dev) {
+        if (!ip6_fb_tnl_dev) {
                 err = -ENOMEM;
                 goto fail;
         }
-        ip6ip6_fb_tnl_dev->init = ip6ip6_fb_tnl_dev_init;
+        ip6_fb_tnl_dev->init = ip6_fb_tnl_dev_init;
 
-        if ((err = register_netdev(ip6ip6_fb_tnl_dev))) {
-                free_netdev(ip6ip6_fb_tnl_dev);
+        if ((err = register_netdev(ip6_fb_tnl_dev))) {
+                free_netdev(ip6_fb_tnl_dev);
                 goto fail;
         }
         return 0;
 fail:
         xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6);
+unreg_ip4ip6:
+        xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET);
+out:
         return err;
 }
 
-static void __exit ip6ip6_destroy_tunnels(void)
+static void __exit ip6_tnl_destroy_tunnels(void)
 {
         int h;
         struct ip6_tnl *t;
@@ -1168,11 +1450,14 @@ static void __exit ip6ip6_destroy_tunnels(void)
 
 static void __exit ip6_tunnel_cleanup(void)
 {
+        if (xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET))
+                printk(KERN_INFO "ip6_tunnel close: can't deregister ip4ip6\n");
+
         if (xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6))
-                printk(KERN_INFO "ip6ip6 close: can't deregister tunnel\n");
+                printk(KERN_INFO "ip6_tunnel close: can't deregister ip6ip6\n");
 
         rtnl_lock();
-        ip6ip6_destroy_tunnels();
+        ip6_tnl_destroy_tunnels();
         rtnl_unlock();
 }