Date: Thu, 15 Apr 2021 21:32:27 +0200 From: Ronald Klop <ronald-lists@klop.ws> To: Kevin Bowling <kbowling@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 68a46f11eada - main - e1000: Restore VF interface random MAC Message-ID: <5b50b23a-71cd-5221-c905-ccffe841bc98@klop.ws> In-Reply-To: <202104151848.13FImMA5091035@gitrepo.freebsd.org> References: <202104151848.13FImMA5091035@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 4/15/21 8:48 PM, Kevin Bowling wrote: > The branch main has been updated by kbowling (ports committer): > > URL: https://cgit.FreeBSD.org/src/commit/?id=68a46f11eadab48a1da9e3d3900569a6a1ce142e > > commit 68a46f11eadab48a1da9e3d3900569a6a1ce142e > Author: Kevin Bowling <kbowling@FreeBSD.org> > AuthorDate: 2021-04-15 18:45:02 +0000 > Commit: Kevin Bowling <kbowling@FreeBSD.org> > CommitDate: 2021-04-15 18:45:02 +0000 > > e1000: Restore VF interface random MAC > > Restore 525e07418c77 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 > --- > sys/dev/e1000/if_em.c | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c > index 6f022c80c01c..79a617b3342f 100644 > --- a/sys/dev/e1000/if_em.c > +++ b/sys/dev/e1000/if_em.c > @@ -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; > + } Just curious. Would ether_gen_addr() be useful here? It is implemented in net/if_ethersubr.c. Regards, Ronald. > } > > /* 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 > _______________________________________________ > dev-commits-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all > To unsubscribe, send any mail to "dev-commits-src-all-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5b50b23a-71cd-5221-c905-ccffe841bc98>