Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   You Kangren <youkangren@vivo.com>
To:     Kalle Valo <kvalo@kernel.org>, You Kangren <youkangren@vivo.com>,
        Dongliang Mu <dzm91@hust.edu.cn>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        Simon Horman <simon.horman@corigine.com>,
        linux-wireless@vger.kernel.org (open list:RAYLINK/WEBGEAR 802.11
        WIRELESS LAN DRIVER), linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com
Subject: [PATCH v2] wifi: ray_cs: Remove unnecessary conditional statements
Date:   Tue, 27 Jun 2023 10:42:07 +0800
Message-Id: <20230627024211.18385-1-youkangren@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vrd3RBjginTj5+HuR1ZRZ32vLAP3ZYxcE8y6Cf9PRbOa1jlU7yyV+gcVGqh5?=
 =?us-ascii?Q?eGADeQ31OnE2oTbdzxM36XAl4d45HDIK4ULFH7aAXnXXBYne5gBf+wumpV5g?=
 =?us-ascii?Q?fchOx97aHjcvXiu+1YWfMFN7s44WiRrNMA3/wx4eIcX3+VO9+ge8tg8P9RDe?=
 =?us-ascii?Q?10YwLRWzvGJ32Zy6Mge2BrB3OaWG49rByxywJnb5eNCPhIhc+8M/DmpCyppg?=
 =?us-ascii?Q?+6Ze5cMIZTSPFZ+zE8HkdnChqVgVMKD0zr7/66Fw13o70TVYq4iNZObbPLlF?=
 =?us-ascii?Q?m0ySY0ZwZ4xEoOW0GdAVkzcK3p/RUmrTsEl4JCSUHciKzielFgWVwTmdRp6J?=
 =?us-ascii?Q?e+o+Tg1jgh/WpJQPwYFeCYOLFg5JTrtGb7cT3NIHcW3chk1mz4hz2NAtXpyf?=
 =?us-ascii?Q?qi0AbJFS+NlilXfAUkfrh4Ux7xs3OqFLPYVrHCjLFVNfOlqJNJNw+qoPXzAz?=
 =?us-ascii?Q?A+V8AHih9IV6rBnULFaNycsSGc3j9fh50EvLuJlNUb298AOf0xNSCiI7TpJ/?=
 =?us-ascii?Q?h1iLMz5G614pXZ5pPX7NuQoA1Dbsj7VrZLGEL+PFPt8JMdDyDjEkc7atf4w3?=
 =?us-ascii?Q?lmZO6GuZufuX9lYqRxFx2PcyJ6NO87gCfNDjovwtsnD+TXqYLukvzIhPK0/G?=
 =?us-ascii?Q?s8QBcRL4/bJqcvkND1WWb644DS6u4h2GUtSM3vy5H9cbPHaqLjQSV1rLwjMb?=
 =?us-ascii?Q?+1tIOj3/rjkOnknddgfrTQm7aWrwHj6wZ7sKTTnE0I9ZDDAB/EU3AjdrZv+W?=
 =?us-ascii?Q?LX30pEzALpszkqnXXFVBqQlXS0zzjGrXYLhGmopUq09Sovw5dO/+Q2clat9R?=
 =?us-ascii?Q?MJAv+WSsjqpuLsBrWBp1JXUQ0MolIDPJ7+TeOvCOeyTYf0uTNWdzCOtOiO38?=
 =?us-ascii?Q?pFmoZGq641gPa0e25eEAEKrxJlrM9lYJTIPBv+/tEzvKJ0X0n/aiSduquLSI?=
 =?us-ascii?Q?6itUN+qBjtzMB/GAEmSYOlrxeF7tgX6dI6lUhwoKzKiAlDzCNFRlJ/YpcCa4?=
 =?us-ascii?Q?HgOYmWBmG6FwjtO6tP7gziJBTcJi1U3LxGlpd2Slhv6dt8u9DZy32FP2i7D+?=
 =?us-ascii?Q?CvIqjHgk7id5FN9CqbwXAmvhSSoeu4Zcp2+GXi7wOWhBT0itrPugb+mTy+cN?=
 =?us-ascii?Q?Sp08+iQ127qXobJHRMDi7zJc2F3dbdWngnIN5gqM4shOhIXDMMgyBGGNI7hz?=
 =?us-ascii?Q?SS8d0LH9TlJCEOJI4ZPYTxWk6XV6RPXZNzBKviR2Ar1/dkCo/AR80KPLcv/s?=
 =?us-ascii?Q?Blry1zNMXGF3EhsTFdw5gPHaNp2fkoWhZhFJhR+hD8x97wRqCZAhvI7NJoQh?=
 =?us-ascii?Q?E9Wt6ulyehKegoVmqXkiyhTzxij3zAFH7o1ai4Bott8PVTJe/iUFYbRrgKmV?=
 =?us-ascii?Q?AR5l8zwpG0xMiFvlbDwVa1dQ3Yw91THbR6Bpeb1YxJXCjH0gGGJGERwQxrJP?=
 =?us-ascii?Q?k+fNaSNdzDbkRlvYOTK5565SOpohOgiCpxOf0gl6St7KVMqyp34VDuJYvcrr?=
 =?us-ascii?Q?UCv+s4UXF8l9Zo0DrZmf8AcjBC1KoDa2uhzgtkPMYPk7rBBujVio8mWP0Iim?=
 =?us-ascii?Q?YjzRSbZwpcH2NVEoTuqEYBskz2AUpbQr7Nk462gD?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e251c4ef-4e35-47aa-1b26-08db76b82065
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 02:42:19.4572
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lQh2trPDZukMiH/T9SSBY3crT9rnWWbZoRsT/LgO07hkNGXMAi+ZsKAEEYc6Nu1/ZtLH43nPX/i0OHxu+Bn9JA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR06MB6528
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

Remove unnecessary conditional statements to simplify the code

Signed-off-by: You Kangren <youkangren@vivo.com>
---
 drivers/net/wireless/legacy/ray_cs.c | 30 ++++++----------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c
index 5f97fcf5c4ba..e4ea22316a03 100644
--- a/drivers/net/wireless/legacy/ray_cs.c
+++ b/drivers/net/wireless/legacy/ray_cs.c
@@ -2115,30 +2115,12 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs,
 	u_char linksrcaddr[ETH_ALEN];	/* Other end of the wireless link */
 #endif
 
-	if (!sniffer) {
-		if (translate) {
-/* TBD length needs fixing for translated header */
-			if (rx_len < (ETH_HLEN + RX_MAC_HEADER_LENGTH) ||
-			    rx_len >
-			    (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN +
-			     FCS_LEN)) {
-				pr_debug(
-				      "ray_cs invalid packet length %d received\n",
-				      rx_len);
-				return;
-			}
-		} else { /* encapsulated ethernet */
-
-			if (rx_len < (ETH_HLEN + RX_MAC_HEADER_LENGTH) ||
-			    rx_len >
-			    (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN +
-			     FCS_LEN)) {
-				pr_debug(
-				      "ray_cs invalid packet length %d received\n",
-				      rx_len);
-				return;
-			}
-		}
+	/* TBD length needs fixing for translated header */
+	if (!sniffer && (rx_len < (ETH_HLEN + RX_MAC_HEADER_LENGTH) ||
+			 rx_len > (dev->mtu + RX_MAC_HEADER_LENGTH +
+				 ETH_HLEN + FCS_LEN))) {
+		pr_debug("ray_cs invalid packet length %d received\n", rx_len);
+		return;
 	}
 	pr_debug("ray_cs rx_data packet\n");
 	/* If fragmented packet, verify sizes of fragments add up */
-- 
2.39.0