d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e1000: Restore VF interface random MAC

Browse Source 
Restore 525e07418c after the iflib conversion of igb(4). This
reenables random MAC address generation when attaching to a VF with a
zeroed MAC.

PR:		253535
Reported by:	Balaev PA <mail@void.so>
Reviewed by:	markj
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D29785
This commit is contained in:
Kevin Bowling 2021-04-15 11:45:02 -07:00
parent bb1b375fa7
commit 68a46f11ea
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/e1000/if_em.c
View File

@ -1061,9 +1061,17 @@ em_if_attach_pre(if_ctx_t ctx)
}
if (!em_is_valid_ether_addr(hw->mac.addr)) {
device_printf(dev, "Invalid MAC address\n");
error = EIO;
goto err_late;
if (adapter->vf_ifp) {
u8 addr[ETHER_ADDR_LEN];
arc4rand(&addr, sizeof(addr), 0);
addr[0] &= 0xFE;
addr[0] |= 0x02;
bcopy(addr, hw->mac.addr, sizeof(addr));
} else {
device_printf(dev, "Invalid MAC address\n");
error = EIO;
goto err_late;
}
}
/* Disable ULP support */
@ -1923,6 +1931,13 @@ em_identify_hardware(if_ctx_t ctx)
device_printf(dev, "Setup init failure\n");
return;
}
/* Are we a VF device? */
if ((adapter->hw.mac.type == e1000_vfadapt) ||
(adapter->hw.mac.type == e1000_vfadapt_i350))
adapter->vf_ifp = 1;
else
adapter->vf_ifp = 0;
}
static int