Date: Fri, 17 Sep 2021 14:20:59 -0700 From: Kevin Bowling <kevin.bowling@kev009.com> To: Kevin Bowling <kbowling@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@FreeBSD.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: d1c37752e2af - main - e1000: expose MAC functions Message-ID: <CAK7dMtDmVkBf7ZQjTNZ331hF0qMbUvdf-s_ZcOJ8bY%2B89EkRKA@mail.gmail.com> In-Reply-To: <202109172119.18HLJtjL029419@gitrepo.freebsd.org> References: <202109172119.18HLJtjL029419@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Sorry for a pasto (X11 clipboard :o)), the DPDK commit hash is aca51d3158c25ea8e50abb3f71c930d667f8c275 here. On Fri, Sep 17, 2021 at 2:19 PM Kevin Bowling <kbowling@freebsd.org> wrote: > > The branch main has been updated by kbowling (ports committer): > > URL: https://cgit.FreeBSD.org/src/commit/?id=d1c37752e2afb51dfb2e08afe714a799788b6ede > > commit d1c37752e2afb51dfb2e08afe714a799788b6ede > Author: Guinan Sun <guinanx.sun@intel.com> > AuthorDate: 2020-07-06 08:12:06 +0000 > Commit: Kevin Bowling <kbowling@FreeBSD.org> > CommitDate: 2021-09-17 21:19:22 +0000 > > e1000: expose MAC functions > > Now the functions are being accessed outside of the file, we need > to properly expose them for silicon families to use. > > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > Signed-off-by: Guinan Sun <guinanx.sun@intel.com> > Reviewed-by: Wei Zhao <wei.zhao1@intel.com> > > Approved by: imp > Obtained from: DPDK (df01c0ee277d51f81d7d72501dba97550d3b6c4a) > MFC after: 1 week > --- > sys/dev/e1000/e1000_mac.c | 3 +-- > sys/dev/e1000/e1000_mac.h | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c > index e0d078d924f9..a13572d8dc18 100644 > --- a/sys/dev/e1000/e1000_mac.c > +++ b/sys/dev/e1000/e1000_mac.c > @@ -38,7 +38,6 @@ > static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw); > static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw); > static void e1000_config_collision_dist_generic(struct e1000_hw *hw); > -static int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index); > > /** > * e1000_init_mac_ops_generic - Initialize MAC function pointers > @@ -484,7 +483,7 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw) > * Sets the receive address array register at index to the address passed > * in by addr. > **/ > -static int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index) > +int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index) > { > u32 rar_low, rar_high; > > diff --git a/sys/dev/e1000/e1000_mac.h b/sys/dev/e1000/e1000_mac.h > index 1f472d42421e..370f7f9d8a1a 100644 > --- a/sys/dev/e1000/e1000_mac.h > +++ b/sys/dev/e1000/e1000_mac.h > @@ -70,6 +70,7 @@ s32 e1000_led_on_generic(struct e1000_hw *hw); > s32 e1000_led_off_generic(struct e1000_hw *hw); > void e1000_update_mc_addr_list_generic(struct e1000_hw *hw, > u8 *mc_addr_list, u32 mc_addr_count); > +int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index); > s32 e1000_set_default_fc_generic(struct e1000_hw *hw); > s32 e1000_set_fc_watermarks_generic(struct e1000_hw *hw); > s32 e1000_setup_fiber_serdes_link_generic(struct e1000_hw *hw); > _______________________________________________ > dev-commits-src-main@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main > To unsubscribe, send any mail to "dev-commits-src-main-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAK7dMtDmVkBf7ZQjTNZ331hF0qMbUvdf-s_ZcOJ8bY%2B89EkRKA>