diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h
index e079fe1f79..000e815809 100644
--- a/MdeModulePkg/Include/Library/IpIoLib.h
+++ b/MdeModulePkg/Include/Library/IpIoLib.h
@@ -160,6 +160,11 @@ typedef struct _EFI_NET_SESSION_DATA {
   EFI_IP_ADDRESS        Source;     ///< Source IP of the received packet
   EFI_IP_ADDRESS        Dest;       ///< Destination IP of the received packet
   IP_IO_IP_HEADER       IpHdr;      ///< IP header of the received packet
+  UINT32                IpHdrLen;   ///< IP header length of the received packet. 
+                                    ///< For IPv6, it includes the IP6 header 
+                                    ///< length and extension header length. For
+                                    ///< IPv4, it includes the IP4 header length
+                                    ///< and options length.
   UINT8                 IpVersion;  ///< The IP version of the received packet
 } EFI_NET_SESSION_DATA;
 
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index c94a79c4dc..4df49a5e7b 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -1057,6 +1057,7 @@ IpIoListenHandlerDpc (
   Session.Source.Addr[0] = EFI_IP4 (RxData->Ip4RxData.Header->SourceAddress);
   Session.Dest.Addr[0]   = EFI_IP4 (RxData->Ip4RxData.Header->DestinationAddress);
   Session.IpHdr.Ip4Hdr   = RxData->Ip4RxData.Header;
+  Session.IpHdrLen       = RxData->Ip4RxData.HeaderLength;
   Session.IpVersion      = IP_VERSION_4;
   } else {
 
@@ -1093,6 +1094,7 @@ IpIoListenHandlerDpc (
       sizeof(EFI_IPv6_ADDRESS)
       );
     Session.IpHdr.Ip6Hdr = RxData->Ip6RxData.Header;
+    Session.IpHdrLen     = RxData->Ip6RxData.HeaderLength;
     Session.IpVersion    = IP_VERSION_6;
   }