[gpxe] Fix virtio-net ethernet frame length (patch by cra), fixes BZ678789

[Matt Domsch]

commit 84c65eae3cf6698ec42e682f856410863580669b
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Mon Feb 21 14:27:14 2011 -0600

    Fix virtio-net ethernet frame length (patch by cra), fixes BZ678789

 gpxe-1.0.1-virtionet-length.patch |   12 ++++++++++++
 gpxe.spec                         |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/gpxe-1.0.1-virtionet-length.patch b/gpxe-1.0.1-virtionet-length.patch
new file mode 100644
index 0000000..45442bc
--- /dev/null
+++ b/gpxe-1.0.1-virtionet-length.patch
@@ -0,0 +1,12 @@
+diff -up gpxe-1.0.1/src/drivers/net/virtio-net.c.framelength gpxe-1.0.1/src/drivers/net/virtio-net.c
+--- gpxe-1.0.1/src/drivers/net/virtio-net.c.framelength	2010-06-29 15:31:33.000000000 -0400
++++ gpxe-1.0.1/src/drivers/net/virtio-net.c	2010-12-09 15:21:41.840551913 -0500
+@@ -170,7 +170,7 @@ static void virtnet_transmit(struct nic 
+    list[0].addr = (char*)&tx_virtio_hdr;
+    list[0].length = sizeof(struct virtio_net_hdr);
+    list[1].addr = (char*)&tx_eth_frame;
+-   list[1].length = ETH_FRAME_LEN;
++   list[1].length = sizeof(tx_eth_frame.hdr) + len;
+ 
+    vring_add_buf(&virtqueue[TX_INDEX], list, 2, 0, 0, 0);
+ 
diff --git a/gpxe.spec b/gpxe.spec
index 8937cfd..0878805 100644
--- a/gpxe.spec
+++ b/gpxe.spec
@@ -10,7 +10,7 @@
 
 Name:    gpxe
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -19,6 +19,7 @@ URL:     http://etherboot.org/
 
 Source0: http://git.etherboot.org/releases/%{name}/%{name}-%{version}.tar.bz2
 Source1: USAGE
+Patch1: %{name}-1.0.1-virtionet-length.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %ifarch %{buildarches}
@@ -73,6 +74,7 @@ DNS, HTTP, iSCSI, etc.
 
 %prep
 %setup -q
+%patch1 -p1
 cp -a %{SOURCE1} .
 
 %build
@@ -140,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Feb 21 2011 Matt Domsch <mdomsch at fedoraproject.org> - 1.0.1-3
+- Fix virtio-net ethernet frame length (patch by cra), fixes BZ678789
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild