git: 74765431b7e9 - main - Fix "set but not used" for the ti driver

[Scott Long]

The branch main has been updated by scottl:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=74765431b7e947254dd428a8cb4e1dcc1618497e

commit 74765431b7e947254dd428a8cb4e1dcc1618497e
Author:     Scott Long <sco...@freebsd.org>
AuthorDate: 2021-12-03 22:31:14 +0000
Commit:     Scott Long <sco...@freebsd.org>
CommitDate: 2021-12-03 22:31:14 +0000

    Fix "set but not used" for the ti driver
    
    Sponsored by: Rubicon Communications, LLC ("Netgate")
---
 sys/dev/ti/if_ti.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index e8b4eb537883..de173e726f62 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -2220,10 +2220,10 @@ ti_gibinit(struct ti_softc *sc)
        ti_hostaddr64(&rcb->ti_hostaddr, sc->ti_rdata.ti_rx_std_ring_paddr);
        rcb->ti_max_len = TI_FRAMELEN;
        rcb->ti_flags = 0;
-       if (sc->ti_ifp->if_capenable & IFCAP_RXCSUM)
+       if (ifp->if_capenable & IFCAP_RXCSUM)
                rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM |
                     TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM;
-       if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
+       if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
                rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST;
 
        /* Set up the jumbo receive ring. */
@@ -2237,10 +2237,10 @@ ti_gibinit(struct ti_softc *sc)
        rcb->ti_max_len = PAGE_SIZE;
        rcb->ti_flags = TI_RCB_FLAG_USE_EXT_RX_BD;
 #endif
-       if (sc->ti_ifp->if_capenable & IFCAP_RXCSUM)
+       if (ifp->if_capenable & IFCAP_RXCSUM)
                rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM |
                     TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM;
-       if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
+       if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
                rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST;
 
        /*
@@ -2255,10 +2255,10 @@ ti_gibinit(struct ti_softc *sc)
                rcb->ti_flags = TI_RCB_FLAG_RING_DISABLED;
        else
                rcb->ti_flags = 0;
-       if (sc->ti_ifp->if_capenable & IFCAP_RXCSUM)
+       if (ifp->if_capenable & IFCAP_RXCSUM)
                rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM |
                     TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM;
-       if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
+       if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
                rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST;
 
        /*
@@ -2289,9 +2289,9 @@ ti_gibinit(struct ti_softc *sc)
                rcb->ti_flags = 0;
        else
                rcb->ti_flags = TI_RCB_FLAG_HOST_RING;
-       if (sc->ti_ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
+       if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
                rcb->ti_flags |= TI_RCB_FLAG_VLAN_ASSIST;
-       if (sc->ti_ifp->if_capenable & IFCAP_TXCSUM)
+       if (ifp->if_capenable & IFCAP_TXCSUM)
                rcb->ti_flags |= TI_RCB_FLAG_TCP_UDP_CKSUM |
                     TI_RCB_FLAG_IP_CKSUM | TI_RCB_FLAG_NO_PHDR_CKSUM;
        rcb->ti_max_len = TI_TX_RING_CNT;