summaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2014-11-23 16:28:43 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-23 21:00:56 -0500
commite5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch)
tree6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/addrconf.c
parent78e2045d3d562e43562e3cbf0e96c26e38a718e9 (diff)
ipv6: coding style improvements (remove assignment in if statements)
This change has no functional impact and simply addresses some coding style issues detected by checkpatch. Specifically this change adjusts "if" statements which also include the assignment of a variable. No changes to the resultant object files result as determined by objdiff. Signed-off-by: Ian Morris <ipm@chirality.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 251fcb48b216..9eac3a7fefa3 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2543,7 +2543,8 @@ static int inet6_addr_del(struct net *net, int ifindex, u32 ifa_flags,
2543 if (!dev) 2543 if (!dev)
2544 return -ENODEV; 2544 return -ENODEV;
2545 2545
2546 if ((idev = __in6_dev_get(dev)) == NULL) 2546 idev = __in6_dev_get(dev);
2547 if (idev == NULL)
2547 return -ENXIO; 2548 return -ENXIO;
2548 2549
2549 read_lock_bh(&idev->lock); 2550 read_lock_bh(&idev->lock);
@@ -2690,7 +2691,8 @@ static void init_loopback(struct net_device *dev)
2690 2691
2691 ASSERT_RTNL(); 2692 ASSERT_RTNL();
2692 2693
2693 if ((idev = ipv6_find_idev(dev)) == NULL) { 2694 idev = ipv6_find_idev(dev);
2695 if (idev == NULL) {
2694 pr_debug("%s: add_dev failed\n", __func__); 2696 pr_debug("%s: add_dev failed\n", __func__);
2695 return; 2697 return;
2696 } 2698 }
@@ -2813,7 +2815,8 @@ static void addrconf_sit_config(struct net_device *dev)
2813 * our v4 addrs in the tunnel 2815 * our v4 addrs in the tunnel
2814 */ 2816 */
2815 2817
2816 if ((idev = ipv6_find_idev(dev)) == NULL) { 2818 idev = ipv6_find_idev(dev);
2819 if (idev == NULL) {
2817 pr_debug("%s: add_dev failed\n", __func__); 2820 pr_debug("%s: add_dev failed\n", __func__);
2818 return; 2821 return;
2819 } 2822 }
@@ -2837,7 +2840,8 @@ static void addrconf_gre_config(struct net_device *dev)
2837 2840
2838 ASSERT_RTNL(); 2841 ASSERT_RTNL();
2839 2842
2840 if ((idev = ipv6_find_idev(dev)) == NULL) { 2843 idev = ipv6_find_idev(dev);
2844 if (idev == NULL) {
2841 pr_debug("%s: add_dev failed\n", __func__); 2845 pr_debug("%s: add_dev failed\n", __func__);
2842 return; 2846 return;
2843 } 2847 }