diff options
| author | James <james.mckenzie@citrix.com> | 2012-11-16 20:51:55 +0000 |
|---|---|---|
| committer | James <james.mckenzie@citrix.com> | 2012-11-16 20:51:55 +0000 |
| commit | fd009cf68391bdcfa71dcdda31bfb24665c7621d (patch) | |
| tree | e21ad8a3b3ca8bd0a9d6a85154c4cb141d2ae636 | |
| parent | f3965fc28fc79bbf22caf6c452068163e41ef22a (diff) | |
| download | grub-1.99-pq-fd009cf68391bdcfa71dcdda31bfb24665c7621d.tar.gz grub-1.99-pq-fd009cf68391bdcfa71dcdda31bfb24665c7621d.tar.bz2 grub-1.99-pq-fd009cf68391bdcfa71dcdda31bfb24665c7621d.zip | |
fish
| -rw-r--r-- | master/jmm/efi-sni-bis | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/master/jmm/efi-sni-bis b/master/jmm/efi-sni-bis index ed6df12..c035e53 100644 --- a/master/jmm/efi-sni-bis +++ b/master/jmm/efi-sni-bis @@ -1,3 +1,23 @@ +diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am +index 0012e59..ad891ff 100644 +--- a/grub-core/Makefile.am ++++ b/grub-core/Makefile.am +@@ -95,6 +95,7 @@ if COND_i386_efi + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h ++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/net.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + +@@ -123,6 +124,7 @@ if COND_x86_64_efi + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h ++KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/net.h + KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h + endif + diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 2cdcc7b..e297c4f 100644 --- a/grub-core/Makefile.core.def @@ -94,7 +114,7 @@ index 5dd5ada..74bbd47 100644 goto fail; diff --git a/grub-core/net/efi/efinet.c b/grub-core/net/efi/efinet.c new file mode 100644 -index 0000000..1d30655 +index 0000000..684df98 --- /dev/null +++ b/grub-core/net/efi/efinet.c @@ -0,0 +1,544 @@ @@ -377,7 +397,7 @@ index 0000000..1d30655 + tx_time = grub_get_time_ms (); + + status = -+ efi_call_7 (private->sni->transmit, private->sni, 0, len, frame, NULL, ++ efi_call_7 (private->sni->transmit, private->sni, 0, len, (void *) frame, NULL, + NULL, NULL); + + if (status == GRUB_EFI_NOT_READY) |