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>,
        You Kangren <youkangren@vivo.com>,
        Simon Horman <simon.horman@corigine.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        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] wifi: ray_cs: Remove invalid conditional statements
Date:   Mon, 26 Jun 2023 18:27:50 +0800
Message-Id: <20230626102752.1583-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?jUdCXE6QRqPtvM1F86VU5YML0HZQK+5Z/wr/ZOi5IGTsOuIjD3I0FUKDpPIl?=
 =?us-ascii?Q?4Jd6XMZOrlP7qX21QKOXjkkMBjawd6ovZJ+OF65FkAFODSxTJ2p8UDhICvgV?=
 =?us-ascii?Q?TQiF5zcGTTjQop8/ugL21USOE18s4tW56Ajqh/WNvSTQSNGx9DhkRJ7f3GZG?=
 =?us-ascii?Q?Q1KZBUrkwEJI/q8b3Kw0w4o3pMrCvSHW6qCu6DhLoupikMNF5ivUpQ2GzMz/?=
 =?us-ascii?Q?UGWVBE8hnKJBJ4mO9RTA9bu+njrmTTa7xisFZ8twN/y4M9DU5BwfSN2gnT0E?=
 =?us-ascii?Q?jBGYIH8zABqC9NeVTqeQS5pHBvQwg0AnBgITF0H6Zhy9qdfLh4U/zBKWIBmi?=
 =?us-ascii?Q?7tHcIfgsMuauhBSLHSUGqNB9ZMOqipfQDJJSvhrxi09z8H1ImQmwA0Q4DByH?=
 =?us-ascii?Q?QV8l+3zMYPQ/41Y+jPa7pBmJSJiJXMiQcCwkmiyZxnGF3fqnLhbPvrWJ22Nw?=
 =?us-ascii?Q?BWv0chsmLe+VqxWlaUu99rFg3YSvAlaKXC55a5egYQYnE+XyjdEGsZ5ihDsX?=
 =?us-ascii?Q?/lPBpzI5OrDcZ5A/vZG6OytT0lTR+63Kukt7LRcXsvuL571fW8TCMHKlw8dC?=
 =?us-ascii?Q?28TCUzY3gnHCvveVmQalO707stm1JBQcaY24AwrMidw2TDjOn+XncYdYOl+3?=
 =?us-ascii?Q?1S7cc4M32NkMOPKvbrP/xgYzwfHI9fag9PXcA1E5akLbINcWQzh5fTADOGen?=
 =?us-ascii?Q?vvkzw/Qjn/GBvIcdFJFyp89sfVExHECq2HaMvP/ixN7fpDvf5RZc+kNkKpxs?=
 =?us-ascii?Q?Rkzx8UJ+faomm076TTQcw1CBiTLcCos2ZiVNZEt2Ftup3BOtwgYNYLU/Ph25?=
 =?us-ascii?Q?x7KLrFpHv7gmHM6H2McNmosWnTtDdzMXA3TyR+lmaGqGyl6ZsX0TdmKtpo1s?=
 =?us-ascii?Q?QNBpgZWXiP0y0IdGJT8dVROjGrLh823WLejI8iNKgYnB1/qBnlTdSZKArW4M?=
 =?us-ascii?Q?z1kXdho5pDzRb9sLG70VQIo1NHm59PcB7XYkWIT359HOZsKYsUmrz8l6qwIs?=
 =?us-ascii?Q?uoiNTFpfdturFD71bNCpYEWo4YiuPK+tXffSjxDpSxaBBZdTcGk19+6kBugs?=
 =?us-ascii?Q?FX5sXmd1jE1RPTr8+nYLj2G0OWnPpVDpQP3C5HrcjceiaV4nQVn6oaasuSMr?=
 =?us-ascii?Q?nl2STplb55PUdD/xk0DMRnkjrHi+vXrsL5mSBLw8ofOrpcodXgguAvsr9L1a?=
 =?us-ascii?Q?R+OTpZZeZoRrddBDa3sGcN/JAv7dZjC9yLWiTH3pnUFRgVbiIUQgM6InYwcD?=
 =?us-ascii?Q?1ThxnTBagUdL81QgeYaYchLCRXxkoP/nXgRbiSyaSSJvS4S6nfyg6DXseArm?=
 =?us-ascii?Q?yGfvBaey3N0E8V+xPVxDSnBXgjelrryGbPfNtbQ5bAJuLGCEi1gHmVzn4Zew?=
 =?us-ascii?Q?t+y6qoLdnRMpTz0UNdMJen0cWhRDG40W6MBXSXtNO4mT/DlR7/sOpo9EARob?=
 =?us-ascii?Q?E1yV+sG3Ak7sHRiHyUYpXdu4bFi6A8+ZUTSxK3M0ZkwqeoDGkoi/ugm97cuM?=
 =?us-ascii?Q?sIsP5SkRZM9UlrUlbDsffXxTsj5useehrKEbmK9bdHQwxZSei/8+0/L+tnvW?=
 =?us-ascii?Q?uaDvqtofVq77bq7aQkIswcGtH8YBajCh50nRI0PR?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e397062d-b9c9-4468-2c2a-08db763004e2
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5936.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 10:28:01.9086
 (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: 1JhOy+OzWoet2erkuMwzkdHY7NPOHHlkUleyc+gLTpf02D379SoXaOG7fgocxul9plrSfWLbVpGWfUDY8shddQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB3886
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
        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 invalid conditional statements to make the code clean

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

diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c
index 96f34d90f601..0022038b0758 100644
--- a/drivers/net/wireless/legacy/ray_cs.c
+++ b/drivers/net/wireless/legacy/ray_cs.c
@@ -2116,7 +2116,6 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs,
 #endif
 
 	if (!sniffer) {
-		if (translate) {
 /* TBD length needs fixing for translated header */
 			if (rx_len < (ETH_HLEN + RX_MAC_HEADER_LENGTH) ||
 			    rx_len >
@@ -2126,18 +2125,6 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs,
 				      "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;
-			}
 		}
 	}
 	pr_debug("ray_cs rx_data packet\n");
-- 
2.39.0