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

Fix regressions by previous commits

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-02 18:15:59 +02:00
parent 5855ddc402
commit e571f2332e
5 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/grub/net.h
View file

@ -59,19 +59,25 @@ typedef enum grub_network_level_protocol_id
GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4
} grub_network_level_protocol_id_t;
typedef union grub_net_network_level_address
typedef struct grub_net_network_level_address
{
grub_network_level_protocol_id_t type;
grub_uint32_t ipv4;
union
{
grub_uint32_t ipv4;
};
} grub_net_network_level_address_t;
typedef union grub_net_network_level_netaddress
typedef struct grub_net_network_level_netaddress
{
grub_network_level_protocol_id_t type;
struct {
grub_uint32_t base;
int masksize;
} ipv4;
union
{
struct {
grub_uint32_t base;
int masksize;
} ipv4;
};
} grub_net_network_level_netaddress_t;
struct grub_net_network_level_interface;
@ -81,7 +87,7 @@ struct grub_net_network_level_interface
struct grub_net_network_level_interface *next;
char *name;
struct grub_net_card *card;
union grub_net_network_level_address address;
grub_net_network_level_address_t address;
void *data;
};