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

Add Virtual LAN support

Browse source 
This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging
allows multiple VLANs in a bridged network to share the same physical
network link but maintain isolation:

http://en.wikipedia.org/wiki/IEEE_802.1Q

* grub-core/net/ethernet.c: Add check, get, and set vlan tag id.
* grub-core/net/drivers/ieee1275/ofnet.c: Get vlan tag id from bootargs.
* grub-core/net/arp.c: Add check.
* grub-core/net/ip.c: Likewise.
* include/grub/net/arp.h: Add vlantag attribute.
* include/grub/net/ip.h: Likewise.
This commit is contained in:
Paulo Flabiano Smorigo 2015-01-23 07:07:30 -02:00
parent 3bac4caa2b
commit 0544db450d
8 changed files with 126 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,11 +147,11 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
char *comma_char = 0;
char *equal_char = 0;
grub_size_t field_counter = 0;
grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
grub_net_link_level_address_t hw_addr;
grub_net_interface_flags_t flags = 0;
struct grub_net_network_level_interface *inter;
grub_uint32_t vlantag = 0;
hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
@ -169,6 +169,18 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
*equal_char = 0;
grub_env_set_net_property ((*card)->name, args, equal_char + 1,
grub_strlen(equal_char + 1));
if ((grub_strcmp (args, "vtag") == 0) &&
(grub_strlen (equal_char + 1) > 4))
{
vlantag = grub_strtoul (equal_char + 1, 0, 16) & 0xffff;
if (grub_errno == GRUB_ERR_BAD_NUMBER)
{
vlantag = 0;
grub_errno = GRUB_ERR_NONE;
}
}
*equal_char = '=';
}
else
@ -207,6 +219,12 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
hw_addr.mac, sizeof(hw_addr.mac), 0);
inter = grub_net_add_addr ((*card)->name, *card, &client_addr, &hw_addr,
flags);
if (vlantag > 0)
{
inter->vlantag.set = 1;
inter->vlantag.vid = vlantag & 0xfff;
}
grub_net_add_ipv4_local (inter,
__builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)));
}