diff options
| author | Ian Morris <ipm@chirality.org.uk> | 2014-11-23 21:28:43 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-23 21:00:56 -0500 |
| commit | e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95 (patch) | |
| tree | 6b8beca04a01e147cf78284fef1e443e5df1f991 /net/ipv6/addrconf.c | |
| parent | 78e2045d3d562e43562e3cbf0e96c26e38a718e9 (diff) | |
| download | linux-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.tar.gz linux-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.tar.bz2 linux-e5d08d718a7cd72c6aa79b5f0c309d9f0d7e4a95.zip | |
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.c | 12 |
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, if (!dev) return -ENODEV; - if ((idev = __in6_dev_get(dev)) == NULL) + idev = __in6_dev_get(dev); + if (idev == NULL) return -ENXIO; read_lock_bh(&idev->lock); @@ -2690,7 +2691,8 @@ static void init_loopback(struct net_device *dev) ASSERT_RTNL(); - if ((idev = ipv6_find_idev(dev)) == NULL) { + idev = ipv6_find_idev(dev); + if (idev == NULL) { pr_debug("%s: add_dev failed\n", __func__); return; } @@ -2813,7 +2815,8 @@ static void addrconf_sit_config(struct net_device *dev) * our v4 addrs in the tunnel */ - if ((idev = ipv6_find_idev(dev)) == NULL) { + idev = ipv6_find_idev(dev); + if (idev == NULL) { pr_debug("%s: add_dev failed\n", __func__); return; } @@ -2837,7 +2840,8 @@ static void addrconf_gre_config(struct net_device *dev) ASSERT_RTNL(); - if ((idev = ipv6_find_idev(dev)) == NULL) { + idev = ipv6_find_idev(dev); + if (idev == NULL) { pr_debug("%s: add_dev failed\n", __func__); return; } |