diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-20 23:44:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-20 23:44:39 -0700 |
| commit | 7eaa48a45ca74d8dbc65e7dedaa8c0736154fd5f (patch) | |
| tree | 07b9d2c56020e348e6d1384506bec2d34ecfa7c6 | |
| parent | f607e059505cd3c3e96096d09f5882eb6421320a (diff) | |
Revert "ipv6: fix checkpatch errors in net/ipv6/addrconf.c"
This reverts commit df8372ca747f6da9e8590775721d9363c1dfc87e.
These changes are buggy and make unintended semantic changes
to ip6_tnl_add_linklocal().
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/addrconf.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 21638d415016..3ca23e89f517 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1110,8 +1110,8 @@ retry: spin_unlock_bh(&ifp->lock); regen_advance = idev->cnf.regen_max_retry * - idev->cnf.dad_transmits * - idev->nd_parms->retrans_time / HZ; + idev->cnf.dad_transmits * + idev->nd_parms->retrans_time / HZ; write_unlock(&idev->lock); /* A temporary address is created only if this calculated Preferred @@ -2501,8 +2501,7 @@ static int inet6_addr_del(struct net *net, int ifindex, const struct in6_addr *p if (!dev) return -ENODEV; - idev = __in6_dev_get(dev); - if (!idev) + if ((idev = __in6_dev_get(dev)) == NULL) return -ENXIO; read_lock_bh(&idev->lock); @@ -2641,8 +2640,7 @@ static void init_loopback(struct net_device *dev) ASSERT_RTNL(); - idev = ipv6_find_idev(dev); - if (!idev) { + if ((idev = ipv6_find_idev(dev)) == NULL) { pr_debug("%s: add_dev failed\n", __func__); return; } @@ -2740,8 +2738,7 @@ static void addrconf_sit_config(struct net_device *dev) * our v4 addrs in the tunnel */ - idev = ipv6_find_idev(dev); - if (!idev) { + if ((idev = ipv6_find_idev(dev)) == NULL) { pr_debug("%s: add_dev failed\n", __func__); return; } @@ -2773,8 +2770,7 @@ static void addrconf_gre_config(struct net_device *dev) ASSERT_RTNL(); - idev = ipv6_find_idev(dev); - if (!idev) { + if ((idev = ipv6_find_idev(dev)) == NULL) { pr_debug("%s: add_dev failed\n", __func__); return; } @@ -2805,11 +2801,11 @@ static void ip6_tnl_add_linklocal(struct inet6_dev *idev) struct net *net = dev_net(idev->dev); /* first try to inherit the link-local address from the link device */ - if (idev->dev->iflink) - link_dev = __dev_get_by_index(net, idev->dev->iflink); - if (link_dev && !ipv6_inherit_linklocal(idev, link_dev)) + if (idev->dev->iflink && + (link_dev = __dev_get_by_index(net, idev->dev->iflink))) { + if (!ipv6_inherit_linklocal(idev, link_dev)) return; - + } /* then try to inherit it from any device */ for_each_netdev(net, link_dev) { if (!ipv6_inherit_linklocal(idev, link_dev)) |