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>, Dongliang Mu <dzm91@hust.edu.cn>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        You Kangren <youkangren@vivo.com>,
        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 v3] Remove unnecessary conditional statements
Date:   Wed, 28 Jun 2023 10:16:46 +0800
Message-Id: <20230628021647.28655-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?WT+8IAPBgAhDQXMj7rxGnlmwgs9+2+u+e4ntDEeEjMbjR+ilsd7v1h8wh3VC?=
 =?us-ascii?Q?TVb3Bagthk8btLzBCQV0702iIT136sPDPW6rn9P9xX/V+4ZJ7goUB6sV1J8I?=
 =?us-ascii?Q?cQAdUB774FVkYMCY6ZdKGfFgzyKorgP5PPP9mhPDey33oJ9+MTp8J/UmawhL?=
 =?us-ascii?Q?XHJaM8s9a+m0MIijbRwocdGsB35RmYXwDZ+TvNIbhzi48Iq+wiKkhlYS8QvC?=
 =?us-ascii?Q?A/itNd5jlXtv2arT/Q7KnBxSZEvUwRm42CPNiF4LvLrAYpgA6Aoj/l50ogtQ?=
 =?us-ascii?Q?o9gi1A1nnzCrPKym/SN9yNrHfderJ2k+hboPeXtomAeRpM0XOP8es1bwl3NE?=
 =?us-ascii?Q?g6/+ON35VIC4MHf5UEtD8v5zDPsqsd5ncD8OblUMtM+nrH4vHQy8THs/s5AG?=
 =?us-ascii?Q?VkUGfHZtgszxvhpG1fhhAvgzImVRNxR+jMJe1fmM6i81z5llGGejAd7s6Qyk?=
 =?us-ascii?Q?BgaTMm/prP/qZIvJNVLpM8w2AVaoyh9b6QkM36EGFFQ2nC4sSQREgL8oI65N?=
 =?us-ascii?Q?0HTEG+uNXLSHV3QK8YteuyVsuRCZsZJZftypf+KNl6c325DAuwIUcsMa/cmX?=
 =?us-ascii?Q?U+XW5f8LoedaVLY448Jkbq7+JnunE3nHgRfYaXgm1NT5FKj5l+D3DlDFCvLb?=
 =?us-ascii?Q?pC53czvu1Swlk1++lr6Hyc23cqOUMstOkdT3Wrk85jtatqv6ZAa1RAChPOJ8?=
 =?us-ascii?Q?tNLBBbgK8zfGHnoUXNV4UN8SpLNyeDitcP0bsvN/1LMOC8PP/yeRtAjlvxEM?=
 =?us-ascii?Q?Mh4VT05nzpDQWtn7oMtflgPpaRbny8sIubIFwZGrULDSOp90HMLMwwf7NiJt?=
 =?us-ascii?Q?imYLkHJloBnGrRa6h+8d2bw89lDu/9GkDJ0mfwpYMRdydB2vyWmg8BFt9vrK?=
 =?us-ascii?Q?X3sTnwJM4srLJmWB0o7g5w828tvXhIimmpV2F3dZOty3rvkNhZwHZo/3OSja?=
 =?us-ascii?Q?dXu1ZVtkof9thG0ZaWjFE0q62Ed0iMjrqMmZvLqbNIMPdZ4xcPBSaXKrNZFn?=
 =?us-ascii?Q?ILMwbZmZCCnY0koSlPbEjOfk3AZMTSnWDIdKq52R26Q3c6L+LfbNMPVb47tk?=
 =?us-ascii?Q?ziVId/zy5fPS/VbemGwdMVzDaUtPEkwNjfBpZFX9gRl8k9BNvP9Tf8X+0KY4?=
 =?us-ascii?Q?VhMi1t9HrMhY0Wb2mi1sXlKfRUlFY+1sEKHDJFT+3hjb4tcIbYXuJn5fSqz7?=
 =?us-ascii?Q?teuvxZNyp9YYLhtcFiqGwxU8H6wKgS+c/5u/fHR+YA6SCwa1sxpLu1b8oieN?=
 =?us-ascii?Q?kluN3os9JZBdTQecnItjHRmiGyvht6U7eu8avwjrDkdhFH3nokxgT/tmoHET?=
 =?us-ascii?Q?77e7p9oOUdrDrO2mLNRXg+FsqOSw//hJ+BJSNhbXEpM5pikvP2cyKdlQ58Qa?=
 =?us-ascii?Q?4FoDNUpEhii600dX8WB2VF90d1gC0+HoDSlP/nOi9HYzIg+5zW2SyFVRsAmd?=
 =?us-ascii?Q?XRwtf4nA3RE2crXXXxenFcqNnC3RgzAPi5qU34EqtDiekq+Wmsfjnb6LLms9?=
 =?us-ascii?Q?AKJ/Q0CGJN5/YWJmGmSVRrmlRmxphKE8O/CqNCfxGOugwz4O5wnOkojmG8E2?=
 =?us-ascii?Q?aE7S1GJg1Ljhb002JsCDFR2ZktzIz9kkArQ+ykN4?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c30dc363-7e8c-4e70-5be9-08db777dbe02
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2023 02:16:54.7922
 (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: OdujKAM9jRdO9Z3HUw+JR+IAz81JMrjnEfgO14vDAzDbZHCd7uSeTArfiwuMGMXqY6+GetyVQ84675d2RSSxkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6131
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

A warning is found at compiling time that the if and else branches 
in the rx_data function have no effect, we check the code and 
find the contents of both branches are the same, so we merge
the contents of both branches into one.

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 8ace797ce951..dc2feb88453e 100644
--- a/drivers/net/wireless/legacy/ray_cs.c
+++ b/drivers/net/wireless/legacy/ray_cs.c
@@ -2116,30 +2116,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