1 files changed, 17 insertions, 17 deletions

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 69a84b464009..9409887fb664 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -412,12 +412,12 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw)
 {
         const struct ipv6hdr *ipv6h = (const struct ipv6hdr *) raw;
         __u8 nexthdr = ipv6h->nexthdr;
-        __u16 off = sizeof (*ipv6h);
+        __u16 off = sizeof(*ipv6h);
 
         while (ipv6_ext_hdr(nexthdr) && nexthdr != NEXTHDR_NONE) {
                 __u16 optlen = 0;
                 struct ipv6_opt_hdr *hdr;
-                if (raw + off + sizeof (*hdr) > skb->data &&
+                if (raw + off + sizeof(*hdr) > skb->data &&
                     !pskb_may_pull(skb, raw - skb->data + off + sizeof (*hdr)))
                         break;
 
@@ -534,7 +534,7 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
                         mtu = IPV6_MIN_MTU;
                 t->dev->mtu = mtu;
 
-                if ((len = sizeof (*ipv6h) + ntohs(ipv6h->payload_len)) > mtu) {
+                if ((len = sizeof(*ipv6h) + ntohs(ipv6h->payload_len)) > mtu) {
                         rel_type = ICMPV6_PKT_TOOBIG;
                         rel_code = 0;
                         rel_info = mtu;
@@ -995,7 +995,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
                                      t->parms.name);
                 goto tx_err_dst_release;
         }
-        mtu = dst_mtu(dst) - sizeof (*ipv6h);
+        mtu = dst_mtu(dst) - sizeof(*ipv6h);
         if (encap_limit >= 0) {
                 max_headroom += 8;
                 mtu -= 8;
@@ -1087,7 +1087,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
                 encap_limit = t->parms.encap_limit;
 
-        memcpy(&fl6, &t->fl.u.ip6, sizeof (fl6));
+        memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));
         fl6.flowi6_proto = IPPROTO_IPIP;
 
         dsfield = ipv4_get_dsfield(iph);
@@ -1139,7 +1139,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
         } else if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
                 encap_limit = t->parms.encap_limit;
 
-        memcpy(&fl6, &t->fl.u.ip6, sizeof (fl6));
+        memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6));
         fl6.flowi6_proto = IPPROTO_IPV6;
 
         dsfield = ipv6_get_dsfield(ipv6h);
@@ -1233,11 +1233,11 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)
 
                 if (rt->dst.dev) {
                         dev->hard_header_len = rt->dst.dev->hard_header_len +
-                                sizeof (struct ipv6hdr);
+                                sizeof(struct ipv6hdr);
 
-                        dev->mtu = rt->dst.dev->mtu - sizeof (struct ipv6hdr);
+                        dev->mtu = rt->dst.dev->mtu - sizeof(struct ipv6hdr);
                         if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
-                                dev->mtu-=8;
+                                dev->mtu -= 8;
 
                         if (dev->mtu < IPV6_MIN_MTU)
                                 dev->mtu = IPV6_MIN_MTU;
@@ -1354,7 +1354,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         switch (cmd) {
         case SIOCGETTUNNEL:
                 if (dev == ip6n->fb_tnl_dev) {
-                        if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof (p))) {
+                        if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p))) {
                                 err = -EFAULT;
                                 break;
                         }
@@ -1366,7 +1366,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         memset(&p, 0, sizeof(p));
                 }
                 ip6_tnl_parm_to_user(&p, &t->parms);
-                if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof (p))) {
+                if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p))) {
                         err = -EFAULT;
                 }
                 break;
@@ -1376,7 +1376,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
                         break;
                 err = -EFAULT;
-                if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof (p)))
+                if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
                         break;
                 err = -EINVAL;
                 if (p.proto != IPPROTO_IPV6 && p.proto != IPPROTO_IPIP &&
@@ -1411,7 +1411,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
                 if (dev == ip6n->fb_tnl_dev) {
                         err = -EFAULT;
-                        if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof (p)))
+                        if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))
                                 break;
                         err = -ENOENT;
                         ip6_tnl_parm_from_user(&p1, &p);
@@ -1486,14 +1486,14 @@ static void ip6_tnl_dev_setup(struct net_device *dev)
         dev->destructor = ip6_dev_free;
 
         dev->type = ARPHRD_TUNNEL6;
-        dev->hard_header_len = LL_MAX_HEADER + sizeof (struct ipv6hdr);
-        dev->mtu = ETH_DATA_LEN - sizeof (struct ipv6hdr);
+        dev->hard_header_len = LL_MAX_HEADER + sizeof(struct ipv6hdr);
+        dev->mtu = ETH_DATA_LEN - sizeof(struct ipv6hdr);
         t = netdev_priv(dev);
         if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
-                dev->mtu-=8;
+                dev->mtu -= 8;
         dev->flags |= IFF_NOARP;
         dev->addr_len = sizeof(struct in6_addr);
-        dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
+        netif_keep_dst(dev);
         /* This perm addr will be used as interface identifier by IPv6 */
         dev->addr_assign_type = NET_ADDR_RANDOM;
         eth_random_addr(dev->perm_addr);