From patchwork Wed May 16 00:52:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subash Abhinov Kasiviswanathan X-Patchwork-Id: 914098 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="l816Wp05"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="l816Wp05"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lwt022PPz9s2L for ; Wed, 16 May 2018 10:53:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752176AbeEPAxl (ORCPT ); Tue, 15 May 2018 20:53:41 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:48122 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbeEPAxj (ORCPT ); Tue, 15 May 2018 20:53:39 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DD3CD60881; Wed, 16 May 2018 00:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526432018; bh=rXLgNBgg1LOlFy38xS7nRGwaYcA71cvoQp0CloKnb0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l816Wp05eu2HgEp96F1yZqtg6+6zBIxtWLOWuAiCoYlYoqwfNCOMLj7LpaVb1tTUJ vlyR2f4E7hVi6vKg0WrOfLMTfiMO5Xx1gTpsy+yW7KIg3R6Rll1bqDnlp70DW61vbb 4UPt1oTR6WEXr8WXS37V60kuYKJqNErICxFVmWHY= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from subashab-lnx.qualcomm.com (unknown [129.46.15.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: subashab@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 29E5260AFB; Wed, 16 May 2018 00:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526432018; bh=rXLgNBgg1LOlFy38xS7nRGwaYcA71cvoQp0CloKnb0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l816Wp05eu2HgEp96F1yZqtg6+6zBIxtWLOWuAiCoYlYoqwfNCOMLj7LpaVb1tTUJ vlyR2f4E7hVi6vKg0WrOfLMTfiMO5Xx1gTpsy+yW7KIg3R6Rll1bqDnlp70DW61vbb 4UPt1oTR6WEXr8WXS37V60kuYKJqNErICxFVmWHY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 29E5260AFB Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=subashab@codeaurora.org From: Subash Abhinov Kasiviswanathan To: davem@davemloft.net, netdev@vger.kernel.org, fengguang.wu@intel.com Cc: Subash Abhinov Kasiviswanathan Subject: [PATCH net-next v2 3/3] net: qualcomm: rmnet: Remove redundant command check Date: Tue, 15 May 2018 18:52:02 -0600 Message-Id: <1526431922-4132-4-git-send-email-subashab@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1526431922-4132-1-git-send-email-subashab@codeaurora.org> References: <1526431922-4132-1-git-send-email-subashab@codeaurora.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The command packet size is already checked once in rmnet_map_deaggregate() for the header, packet and trailer size, so this additional check is not needed. Signed-off-by: Subash Abhinov Kasiviswanathan --- drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c index 78fdad0..56a93df 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c @@ -69,17 +69,9 @@ static void rmnet_map_send_ack(struct sk_buff *skb, struct rmnet_map_control_command *cmd; int xmit_status; - if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) { - if (skb->len < sizeof(struct rmnet_map_header) + - RMNET_MAP_GET_LENGTH(skb) + - sizeof(struct rmnet_map_dl_csum_trailer)) { - kfree_skb(skb); - return; - } - - skb_trim(skb, skb->len - - sizeof(struct rmnet_map_dl_csum_trailer)); - } + if (port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV4) + skb_trim(skb, + skb->len - sizeof(struct rmnet_map_dl_csum_trailer)); skb->protocol = htons(ETH_P_MAP);