net/mlx5e: Properly indent within conditional statements
authorOr Gerlitz <ogerlitz@mellanox.com>
Tue, 11 Jul 2017 12:36:11 +0000 (15:36 +0300)
committerSaeed Mahameed <saeedm@mellanox.com>
Sun, 20 Aug 2017 09:57:19 +0000 (12:57 +0300)
To fix these checkpatch complaints:

WARNING: suspect code indent for conditional statements (8, 24)
+       if (eth_proto & (MLX5E_PROT_MASK(MLX5E_10GBASE_SR)
[...]
+                       return PORT_FIBRE;

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

index a75ac4d11c5bf91e5ad93760e0087b76b6c2b8a7..1f3d87e2861801961f08969cf9db357ffafd3a6c 100644 (file)
@@ -987,24 +987,27 @@ static u8 get_connector_port(u32 eth_proto, u8 connector_type)
        if (connector_type && connector_type < MLX5E_CONNECTOR_TYPE_NUMBER)
                return ptys2connector_type[connector_type];
 
        if (connector_type && connector_type < MLX5E_CONNECTOR_TYPE_NUMBER)
                return ptys2connector_type[connector_type];
 
-       if (eth_proto & (MLX5E_PROT_MASK(MLX5E_10GBASE_SR)
-                        | MLX5E_PROT_MASK(MLX5E_40GBASE_SR4)
-                        | MLX5E_PROT_MASK(MLX5E_100GBASE_SR4)
-                        | MLX5E_PROT_MASK(MLX5E_1000BASE_CX_SGMII))) {
-                       return PORT_FIBRE;
+       if (eth_proto &
+           (MLX5E_PROT_MASK(MLX5E_10GBASE_SR)   |
+            MLX5E_PROT_MASK(MLX5E_40GBASE_SR4)  |
+            MLX5E_PROT_MASK(MLX5E_100GBASE_SR4) |
+            MLX5E_PROT_MASK(MLX5E_1000BASE_CX_SGMII))) {
+               return PORT_FIBRE;
        }
 
        }
 
-       if (eth_proto & (MLX5E_PROT_MASK(MLX5E_40GBASE_CR4)
-                        | MLX5E_PROT_MASK(MLX5E_10GBASE_CR)
-                        | MLX5E_PROT_MASK(MLX5E_100GBASE_CR4))) {
-                       return PORT_DA;
+       if (eth_proto &
+           (MLX5E_PROT_MASK(MLX5E_40GBASE_CR4) |
+            MLX5E_PROT_MASK(MLX5E_10GBASE_CR)  |
+            MLX5E_PROT_MASK(MLX5E_100GBASE_CR4))) {
+               return PORT_DA;
        }
 
        }
 
-       if (eth_proto & (MLX5E_PROT_MASK(MLX5E_10GBASE_KX4)
-                        | MLX5E_PROT_MASK(MLX5E_10GBASE_KR)
-                        | MLX5E_PROT_MASK(MLX5E_40GBASE_KR4)
-                        | MLX5E_PROT_MASK(MLX5E_100GBASE_KR4))) {
-                       return PORT_NONE;
+       if (eth_proto &
+           (MLX5E_PROT_MASK(MLX5E_10GBASE_KX4) |
+            MLX5E_PROT_MASK(MLX5E_10GBASE_KR)  |
+            MLX5E_PROT_MASK(MLX5E_40GBASE_KR4) |
+            MLX5E_PROT_MASK(MLX5E_100GBASE_KR4))) {
+               return PORT_NONE;
        }
 
        return PORT_OTHER;
        }
 
        return PORT_OTHER;