From nobody Tue Apr 30 07:06:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513842396174873.4288213190218; Wed, 20 Dec 2017 23:46:36 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8AD15222447CF; Wed, 20 Dec 2017 23:41:46 -0800 (PST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D979A2219BC89 for ; Wed, 20 Dec 2017 23:41:42 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Dec 2017 23:46:31 -0800 Received: from sfu5-mobl.ccr.corp.intel.com ([10.239.192.229]) by orsmga003.jf.intel.com with ESMTP; 20 Dec 2017 23:46:30 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,434,1508828400"; d="scan'208";a="14103095" From: Fu Siyuan To: edk2-devel@lists.01.org Date: Thu, 21 Dec 2017 15:46:26 +0800 Message-Id: <20171221074626.372-2-siyuan.fu@intel.com> X-Mailer: git-send-email 2.13.0.windows.1 In-Reply-To: <20171221074626.372-1-siyuan.fu@intel.com> References: <20171221074626.372-1-siyuan.fu@intel.com> Subject: [edk2] [Patch] NetworkPkg: Remove redundant check in PXE driver. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ye Ting , Wang Fan , Wu Jiaxin MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The IP protocol has been configured to only receive ICMP packet in PXE driv= er. So this patch removes the unnecessary check for NextHeader field and replac= e it with ASSERT. Cc: Ye Ting Cc: Wu Jiaxin Cc: Wang Fan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Siyuan Reviewed-by: Jiaxin Wu --- NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c b/NetworkPkg/UefiPxeBcD= xe/PxeBcSupport.c index dfc79a067b..720287583e 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c @@ -279,14 +279,11 @@ PxeBcIcmpErrorDpcHandle ( gBS->SignalEvent (RxData->RecycleSignal); goto ON_EXIT; } - - if (RxData->Header->Protocol !=3D EFI_IP_PROTO_ICMP) { - // - // The protocol value in the header of the receveid packet should be E= FI_IP_PROTO_ICMP. - // - gBS->SignalEvent (RxData->RecycleSignal); - goto ON_EXIT; - } + =20 + // + // The protocol has been configured to only receive ICMP packet. + // + ASSERT (RxData->Header->Protocol =3D=3D EFI_IP_PROTO_ICMP); =20 Type =3D *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer); =20 @@ -416,13 +413,10 @@ PxeBcIcmp6ErrorDpcHandle ( goto ON_EXIT; } =20 - if (RxData->Header->NextHeader !=3D IP6_ICMP) { - // - // The nextheader in the header of the receveid packet should be IP6_I= CMP. - // - gBS->SignalEvent (RxData->RecycleSignal); - goto ON_EXIT; - } + // + // The protocol has been configured to only receive ICMP packet. + // + ASSERT (RxData->Header->NextHeader =3D=3D IP6_ICMP); =20 Type =3D *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer); =20 --=20 2.13.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel