vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into net

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-02 18:52:50 +02:00
commit 03a0046581
45 changed files with 682 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/net/drivers/efi/efinet.c
View file

@ -35,7 +35,7 @@ send_card_buffer (const struct grub_net_card *dev,
{
grub_efi_status_t st;
grub_efi_simple_network_t *net = dev->efi_net;
st = efi_call_7 (net->transmit, net, 0, pack->tail - pack->data,
st = efi_call_7 (net->transmit, net, 0, (pack->tail - pack->data),
pack->data, NULL, NULL, NULL);
if (st != GRUB_EFI_SUCCESS)
return grub_error (GRUB_ERR_IO, "Couldn't send network packet.");

12
grub-core/net/drivers/ieee1275/ofnet.c
View file

@ -55,10 +55,9 @@ card_close (struct grub_net_card *dev)
}
static grub_err_t
send_card_buffer (const struct grub_net_card *dev,
struct grub_net_buff *pack)
send_card_buffer (const struct grub_net_card *dev, struct grub_net_buff *pack)
{
int actual;
grub_ssize_t actual;
int status;
struct grub_ofnetcard_data *data = dev->data;
@ -71,11 +70,10 @@ send_card_buffer (const struct grub_net_card *dev,
}
static grub_ssize_t
get_card_packet (const struct grub_net_card *dev,
struct grub_net_buff *nb)
get_card_packet (const struct grub_net_card *dev, struct grub_net_buff *nb)
{
int actual, rc;
grub_ssize_t actual;
int rc;
struct grub_ofnetcard_data *data = dev->data;
grub_uint64_t start_time;