merge mainline into net
This commit is contained in:
commit
03a0046581
45 changed files with 682 additions and 233 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue