]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
s390/qeth: fix indentation in qeth_l3_arp_query
authorSebastian Ott <sebott@linux.vnet.ibm.com>
Thu, 16 Jun 2016 14:19:03 +0000 (16:19 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jun 2016 05:16:13 +0000 (22:16 -0700)
gcc-6 warns about obviously wrong indentation:
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_arp_query':
drivers/s390/net/qeth_l3_main.c:2315:3: warning: this 'if' clause does not
guard... [-Wmisleading-indentation]
   if (copy_to_user(udata, qinfo.udata, 4))
   ^~
drivers/s390/net/qeth_l3_main.c:2317:4: note: ...this statement, but the
latter is misleadingly indented as if it is guarded by the 'if'
    goto free_and_out;
    ^~~~

Although this particular case is harmless, fix the indentation to get rid
of that warning and improve readability.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_l3_main.c

index 05f764c6b23c1447c5b47a78c454163d14d7c78a..bcd324e054a9bdc1e38f7c993a6211a9e83de5cd 100644 (file)
@@ -2314,22 +2314,21 @@ static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata)
        if (rc) {
                if (copy_to_user(udata, qinfo.udata, 4))
                        rc = -EFAULT;
-                       goto free_and_out;
-       } else {
+               goto free_and_out;
+       }
 #ifdef CONFIG_QETH_IPV6
-               if (qinfo.mask_bits & QETH_QARP_WITH_IPV6) {
-                       /* fails in case of GuestLAN QDIO mode */
-                       qeth_l3_query_arp_cache_info(card, QETH_PROT_IPV6,
-                               &qinfo);
-               }
+       if (qinfo.mask_bits & QETH_QARP_WITH_IPV6) {
+               /* fails in case of GuestLAN QDIO mode */
+               qeth_l3_query_arp_cache_info(card, QETH_PROT_IPV6, &qinfo);
+       }
 #endif
-               if (copy_to_user(udata, qinfo.udata, qinfo.udata_len)) {
-                       QETH_CARD_TEXT(card, 4, "qactf");
-                       rc = -EFAULT;
-                       goto free_and_out;
-               }
-               QETH_CARD_TEXT(card, 4, "qacts");
+       if (copy_to_user(udata, qinfo.udata, qinfo.udata_len)) {
+               QETH_CARD_TEXT(card, 4, "qactf");
+               rc = -EFAULT;
+               goto free_and_out;
        }
+       QETH_CARD_TEXT(card, 4, "qacts");
+
 free_and_out:
        kfree(qinfo.udata);
 out: