mirror of
https://github.com/xcat2/xNBA.git
synced 2024-11-23 01:51:58 +00:00
[iscsi] Include 802.1Q VLAN identifier in iBFT
The iBFT NIC section has a VLAN field which must be filled in so that iSCSI booting works over VLANs. Unfortunately it is unclear from the IBM specification linked in ibft.c whether the VLAN field is just the 802.1Q VLAN Identifier or the full 802.1Q TCI. For now just fill in the VID, the Priority Code Point and Drop Eligible Indicator could be set in the future if it turns out they should be present too. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Modified-by: Michael Brown <mcb30@ipxe.org> Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
parent
7426177d63
commit
7d64abbc5d
@ -37,6 +37,7 @@ FILE_LICENCE ( BSD2 );
|
||||
#include <ipxe/in.h>
|
||||
#include <ipxe/netdevice.h>
|
||||
#include <ipxe/ethernet.h>
|
||||
#include <ipxe/vlan.h>
|
||||
#include <ipxe/dhcp.h>
|
||||
#include <ipxe/iscsi.h>
|
||||
#include <ipxe/ibft.h>
|
||||
@ -264,6 +265,8 @@ static int ibft_fill_nic ( struct ibft_nic *nic,
|
||||
DBG ( "iBFT NIC subnet = /%d\n", nic->subnet_mask_prefix );
|
||||
|
||||
/* Extract values from net-device configuration */
|
||||
nic->vlan = cpu_to_le16 ( vlan_tag ( netdev ) );
|
||||
DBG ( "iBFT NIC VLAN = %02x\n", le16_to_cpu ( nic->vlan ) );
|
||||
if ( ( rc = ll_protocol->eth_addr ( netdev->ll_addr,
|
||||
nic->mac_address ) ) != 0 ) {
|
||||
DBG ( "Could not determine iBFT MAC: %s\n", strerror ( rc ) );
|
||||
|
Loading…
Reference in New Issue
Block a user