aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-08-21 02:44:39 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-21 02:44:39 -0400
commit7eaa48a45ca74d8dbc65e7dedaa8c0736154fd5f (patch)
tree07b9d2c56020e348e6d1384506bec2d34ecfa7c6
parentf607e059505cd3c3e96096d09f5882eb6421320a (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.c24
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:
1110 spin_unlock_bh(&ifp->lock); 1110 spin_unlock_bh(&ifp->lock);
1111 1111
1112 regen_advance = idev->cnf.regen_max_retry * 1112 regen_advance = idev->cnf.regen_max_retry *
1113 idev->cnf.dad_transmits * 1113 idev->cnf.dad_transmits *
1114 idev->nd_parms->retrans_time / HZ; 1114 idev->nd_parms->retrans_time / HZ;
1115 write_unlock(&idev->lock); 1115 write_unlock(&idev->lock);
1116 1116
1117 /* A temporary address is created only if this calculated Preferred 1117 /* 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
2501 if (!dev) 2501 if (!dev)
2502 return -ENODEV; 2502 return -ENODEV;
2503 2503
2504 idev = __in6_dev_get(dev); 2504 if ((idev = __in6_dev_get(dev)) == NULL)
2505 if (!idev)
2506 return -ENXIO; 2505 return -ENXIO;
2507 2506
2508 read_lock_bh(&idev->lock); 2507 read_lock_bh(&idev->lock);
@@ -2641,8 +2640,7 @@ static void init_loopback(struct net_device *dev)
2641 2640
2642 ASSERT_RTNL(); 2641 ASSERT_RTNL();
2643 2642
2644 idev = ipv6_find_idev(dev); 2643 if ((idev = ipv6_find_idev(dev)) == NULL) {
2645 if (!idev) {
2646 pr_debug("%s: add_dev failed\n", __func__); 2644 pr_debug("%s: add_dev failed\n", __func__);
2647 return; 2645 return;
2648 } 2646 }
@@ -2740,8 +2738,7 @@ static void addrconf_sit_config(struct net_device *dev)
2740 * our v4 addrs in the tunnel 2738 * our v4 addrs in the tunnel
2741 */ 2739 */
2742 2740
2743 idev = ipv6_find_idev(dev); 2741 if ((idev = ipv6_find_idev(dev)) == NULL) {
2744 if (!idev) {
2745 pr_debug("%s: add_dev failed\n", __func__); 2742 pr_debug("%s: add_dev failed\n", __func__);
2746 return; 2743 return;
2747 } 2744 }
@@ -2773,8 +2770,7 @@ static void addrconf_gre_config(struct net_device *dev)
2773 2770
2774 ASSERT_RTNL(); 2771 ASSERT_RTNL();
2775 2772
2776 idev = ipv6_find_idev(dev); 2773 if ((idev = ipv6_find_idev(dev)) == NULL) {
2777 if (!idev) {
2778 pr_debug("%s: add_dev failed\n", __func__); 2774 pr_debug("%s: add_dev failed\n", __func__);
2779 return; 2775 return;
2780 } 2776 }
@@ -2805,11 +2801,11 @@ static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
2805 struct net *net = dev_net(idev->dev); 2801 struct net *net = dev_net(idev->dev);
2806 2802
2807 /* first try to inherit the link-local address from the link device */ 2803 /* first try to inherit the link-local address from the link device */
2808 if (idev->dev->iflink) 2804 if (idev->dev->iflink &&
2809 link_dev = __dev_get_by_index(net, idev->dev->iflink); 2805 (link_dev = __dev_get_by_index(net, idev->dev->iflink))) {
2810 if (link_dev && !ipv6_inherit_linklocal(idev, link_dev)) 2806 if (!ipv6_inherit_linklocal(idev, link_dev))
2811 return; 2807 return;
2812 2808 }
2813 /* then try to inherit it from any device */ 2809 /* then try to inherit it from any device */
2814 for_each_netdev(net, link_dev) { 2810 for_each_netdev(net, link_dev) {
2815 if (!ipv6_inherit_linklocal(idev, link_dev)) 2811 if (!ipv6_inherit_linklocal(idev, link_dev))