git: 8d5feede40b4 - main - IfAPI: Finish changes of ice(4).
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Feb 2023 15:36:18 UTC
The branch main has been updated by jhibbits:
URL: https://cgit.FreeBSD.org/src/commit/?id=8d5feede40b489a6c0b2f2ee5258f8851ae6af88
commit 8d5feede40b489a6c0b2f2ee5258f8851ae6af88
Author: Justin Hibbits <jhibbits@FreeBSD.org>
AuthorDate: 2023-01-23 15:42:13 +0000
Commit: Justin Hibbits <jhibbits@FreeBSD.org>
CommitDate: 2023-02-14 15:21:19 +0000
IfAPI: Finish changes of ice(4).
Reviewed by: erj
Sponsored by: Juniper Networks, Inc.
Differential Revision: https://reviews.freebsd.org/D38423
---
sys/dev/ice/ice_iflib_txrx.c | 2 +-
sys/dev/ice/ice_lib.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c
index f2ae62c77f7c..89c85357a755 100644
--- a/sys/dev/ice/ice_iflib_txrx.c
+++ b/sys/dev/ice/ice_iflib_txrx.c
@@ -419,7 +419,7 @@ ice_ift_queue_select(void *arg, struct mbuf *m, if_pkt_info_t pi)
/* Included to match default iflib behavior */
/* Only go out on default queue if ALTQ is enabled */
struct ifnet *ifp = (struct ifnet *)iflib_get_ifp(sc->ctx);
- if (ALTQ_IS_ENABLED(&ifp->if_snd))
+ if (if_altq_is_enabled(ifp))
return (0);
#endif
diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c
index 43311ddf3f8e..da69145e85de 100644
--- a/sys/dev/ice/ice_lib.c
+++ b/sys/dev/ice/ice_lib.c
@@ -7514,7 +7514,7 @@ ice_link_up_msg(struct ice_softc *sc)
int
ice_update_laa_mac(struct ice_softc *sc)
{
- const u8 *lladdr = (const u8 *)IF_LLADDR(sc->ifp);
+ const u8 *lladdr = (const u8 *)if_getlladdr(sc->ifp);
struct ice_hw *hw = &sc->hw;
enum ice_status status;