diff options
| author | Joe Perches <joe@perches.com> | 2009-11-23 10:41:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-23 10:41:23 -0800 |
| commit | 9d4fb27db90043cd2640e4bc778f9c755d3c17c1 (patch) | |
| tree | 53f1b0851fdd02e78a18f1a9db57e7cc22e2b280 /net/ipv4/ipconfig.c | |
| parent | 6ebfbc065624790772398f5b327ac33a7ae3880b (diff) | |
| download | linux-3.10-9d4fb27db90043cd2640e4bc778f9c755d3c17c1.tar.gz linux-3.10-9d4fb27db90043cd2640e4bc778f9c755d3c17c1.tar.bz2 linux-3.10-9d4fb27db90043cd2640e4bc778f9c755d3c17c1.zip | |
net/ipv4: Move && and || to end of previous line
On Sun, 2009-11-22 at 16:31 -0800, David Miller wrote:
> It should be of the form:
> if (x &&
> y)
>
> or:
> if (x && y)
>
> Fix patches, rather than complaints, for existing cases where things
> do not follow this pattern are certainly welcome.
Also collapsed some multiple tabs to single space.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index f8d04c25645..4e08b7f2331 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1172,10 +1172,9 @@ static int __init ic_dynamic(void) schedule_timeout_uninterruptible(1); #ifdef IPCONFIG_DHCP /* DHCP isn't done until we get a DHCPACK. */ - if ((ic_got_reply & IC_BOOTP) - && (ic_proto_enabled & IC_USE_DHCP) - && ic_dhcp_msgtype != DHCPACK) - { + if ((ic_got_reply & IC_BOOTP) && + (ic_proto_enabled & IC_USE_DHCP) && + ic_dhcp_msgtype != DHCPACK) { ic_got_reply = 0; printk(","); continue; @@ -1344,9 +1343,9 @@ static int __init ip_auto_config(void) */ if (ic_myaddr == NONE || #ifdef CONFIG_ROOT_NFS - (root_server_addr == NONE - && ic_servaddr == NONE - && ROOT_DEV == Root_NFS) || + (root_server_addr == NONE && + ic_servaddr == NONE && + ROOT_DEV == Root_NFS) || #endif ic_first_dev->next) { #ifdef IPCONFIG_DYNAMIC |