From: Seth Goldberg <seth.goldberg@oracle.com>
Date: Tue, 24 Jan 2012 02:01:46 +0000 (+0100)
Subject: 	* grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_recv): Relax checks as
X-Git-Tag: 2.00~777
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e555f379be99c1a4a59e0fa0cee5ea6fa4f46c56;p=thirdparty%2Fgrub.git

	* grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_recv): Relax checks as
	a workaround for intel problem.
---

diff --git a/ChangeLog b/ChangeLog
index aae30b538..1f575d15b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-14  Seth Goldberg <seth.goldberg@oracle.com>
+
+	* grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_recv): Relax checks as
+	a workaround for intel problem.
+
 2012-01-23  Paulo de Rezende Pinatti <ppinatti@linux.vnet.ibm.com>
 2012-01-23  Vladimir Serbinenko  <phcoder@gmail.com>
 2012-01-23  pfsmorigo
diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
index 3343533ef..34e43f585 100644
--- a/grub-core/net/drivers/i386/pc/pxe.c
+++ b/grub-core/net/drivers/i386/pc/pxe.c
@@ -179,7 +179,11 @@ grub_pxe_recv (const struct grub_net_card *dev __attribute__ ((unused)))
       grub_memset (isr, 0, sizeof (*isr));
       isr->func_flag = GRUB_PXE_ISR_IN_START;
       grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry);
-      if (isr->status || isr->func_flag != GRUB_PXE_ISR_OUT_OURS)
+      /* Normally according to the specification we should also check
+	 that isr->func_flag != GRUB_PXE_ISR_OUT_OURS but unfortunately it
+	 breaks on intel cards.
+       */
+      if (isr->status)
 	{
 	  in_progress = 0;
 	  return NULL;