From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 96F0021954092 for ; Tue, 25 Apr 2017 01:05:22 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2017 01:05:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,248,1488873600"; d="scan'208";a="80583885" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga004.jf.intel.com with ESMTP; 25 Apr 2017 01:05:21 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 25 Apr 2017 01:05:07 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 25 Apr 2017 01:05:07 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.117]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.224]) with mapi id 14.03.0319.002; Tue, 25 Apr 2017 16:05:04 +0800 From: "Wu, Jiaxin" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Wang, Fan" Thread-Topic: [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option Thread-Index: AQHSuYV/GISj/ZkkXk6tnyli7925ZKHVwjPQ Date: Tue, 25 Apr 2017 08:05:03 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B7274162C2EE7@SHSMSX103.ccr.corp.intel.com> References: <20170420032321.61692-1-ruiyu.ni@intel.com> In-Reply-To: <20170420032321.61692-1-ruiyu.ni@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDY5NDhmN2QtMDEzMC00NDMwLTgyOTktNTk1Y2M0N2VkMWU1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IlZVdjhZYnBiZm1UNFlrVGVpSGNWa3A2YmdmVml3Zjc0U2luTzVJSjdwd3M9In0= x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2017 08:05:22 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu Jiaxin Thanks, Jiaxin > -----Original Message----- > From: Ni, Ruiyu > Sent: Thursday, April 20, 2017 11:23 AM > To: edk2-devel@lists.01.org > Cc: Wang, Fan ; Wu, Jiaxin > Subject: [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi- > Fi boot option >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni > Cc: Fan Wang > Cc: Jiaxin Wu > --- > .../Library/UefiBootManagerLib/BmBootDescription.c | 28 > ++++++++++++++++++---- > 1 file changed, 23 insertions(+), 5 deletions(-) >=20 > diff --git > a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c > b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c > index 501a0cc255..6e69a1540a 100644 > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c > @@ -382,13 +382,13 @@ BmGetNetworkDescription ( >=20 > // > // The PXE device path is like: > - // ....../Mac(...)[/Vlan(...)] > - // ....../Mac(...)[/Vlan(...)]/IPv4(...) > - // ....../Mac(...)[/Vlan(...)]/IPv6(...) > + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)] > + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...) > + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...) > // > // The HTTP device path is like: > - // ....../Mac(...)[/Vlan(...)]/IPv4(...)/Uri(...) > - // ....../Mac(...)[/Vlan(...)]/IPv6(...)/Uri(...) > + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)/Uri(...) > + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)/Uri(...) > // > while (!IsDevicePathEnd (DevicePath) && > ((DevicePathType (DevicePath) !=3D MESSAGING_DEVICE_PATH) || > @@ -404,6 +404,9 @@ BmGetNetworkDescription ( > Mac =3D (MAC_ADDR_DEVICE_PATH *) DevicePath; > DevicePath =3D NextDevicePathNode (DevicePath); >=20 > + // > + // Locate the optional Vlan node > + // > if ((DevicePathType (DevicePath) =3D=3D MESSAGING_DEVICE_PATH) && > (DevicePathSubType (DevicePath) =3D=3D MSG_VLAN_DP) > ) { > @@ -413,6 +416,18 @@ BmGetNetworkDescription ( > Vlan =3D NULL; > } >=20 > + // > + // Skip the optional Wi-Fi node > + // > + if ((DevicePathType (DevicePath) =3D=3D MESSAGING_DEVICE_PATH) && > + (DevicePathSubType (DevicePath) =3D=3D MSG_WIFI_DP) > + ) { > + DevicePath =3D NextDevicePathNode (DevicePath); > + } > + > + // > + // Locate the IP node > + // > if ((DevicePathType (DevicePath) =3D=3D MESSAGING_DEVICE_PATH) && > ((DevicePathSubType (DevicePath) =3D=3D MSG_IPv4_DP) || > (DevicePathSubType (DevicePath) =3D=3D MSG_IPv6_DP)) > @@ -423,6 +438,9 @@ BmGetNetworkDescription ( > Ip =3D NULL; > } >=20 > + // > + // Locate the URI node > + // > if ((DevicePathType (DevicePath) =3D=3D MESSAGING_DEVICE_PATH) && > (DevicePathSubType (DevicePath) =3D=3D MSG_URI_DP) > ) { > -- > 2.12.2.windows.2