Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / net / ipv4 / ipconfig.c

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 7dcbf47060994dcb2fb92acc63178c44a0455e6d..10a6a604bf32bee0aa1f4a7d591557173919d296 100644 (file)
--- 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