diff options
| author | andre <andre@FreeBSD.org> | 2013-08-24 19:38:36 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2013-08-24 19:38:36 +0000 |
| commit | 79d40bcf2d33796830bd39a0791e82ba2fc2b42c (patch) | |
| tree | cd4dfe1cd97ca20d05ebbd5d81ddcc5618d14cd6 /sys/dev/nfe | |
| parent | 32eeb1af5cd5cf73675696731e1af95d1bb0d69f (diff) | |
| download | FreeBSD-src-79d40bcf2d33796830bd39a0791e82ba2fc2b42c.zip FreeBSD-src-79d40bcf2d33796830bd39a0791e82ba2fc2b42c.tar.gz | |
Change local variable tso_segsz to tsosegsz to avoid mbuf.h macro conflicts.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/dev/nfe')
| -rw-r--r-- | sys/dev/nfe/if_nfe.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index 13099e9..cd8f985 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -2390,7 +2390,7 @@ nfe_encap(struct nfe_softc *sc, struct mbuf **m_head) bus_dmamap_t map; bus_dma_segment_t segs[NFE_MAX_SCATTER]; int error, i, nsegs, prod, si; - uint32_t tso_segsz; + uint32_t tsosegsz; uint16_t cflags, flags; struct mbuf *m; @@ -2429,9 +2429,9 @@ nfe_encap(struct nfe_softc *sc, struct mbuf **m_head) m = *m_head; cflags = flags = 0; - tso_segsz = 0; + tsosegsz = 0; if ((m->m_pkthdr.csum_flags & CSUM_TSO) != 0) { - tso_segsz = (uint32_t)m->m_pkthdr.tso_segsz << + tsosegsz = (uint32_t)m->m_pkthdr.tso_segsz << NFE_TX_TSO_SHIFT; cflags &= ~(NFE_TX_IP_CSUM | NFE_TX_TCP_UDP_CSUM); cflags |= NFE_TX_TSO; @@ -2482,14 +2482,14 @@ nfe_encap(struct nfe_softc *sc, struct mbuf **m_head) if ((m->m_flags & M_VLANTAG) != 0) desc64->vtag = htole32(NFE_TX_VTAG | m->m_pkthdr.ether_vtag); - if (tso_segsz != 0) { + if (tsosegsz != 0) { /* * XXX * The following indicates the descriptor element * is a 32bit quantity. */ - desc64->length |= htole16((uint16_t)tso_segsz); - desc64->flags |= htole16(tso_segsz >> 16); + desc64->length |= htole16((uint16_t)tsosegsz); + desc64->flags |= htole16(tsosegsz >> 16); } /* * finally, set the valid/checksum/TSO bit in the first @@ -2502,14 +2502,14 @@ nfe_encap(struct nfe_softc *sc, struct mbuf **m_head) else desc32->flags |= htole16(NFE_TX_LASTFRAG_V1); desc32 = &sc->txq.desc32[si]; - if (tso_segsz != 0) { + if (tsosegsz != 0) { /* * XXX * The following indicates the descriptor element * is a 32bit quantity. */ - desc32->length |= htole16((uint16_t)tso_segsz); - desc32->flags |= htole16(tso_segsz >> 16); + desc32->length |= htole16((uint16_t)tsosegsz); + desc32->flags |= htole16(tsosegsz >> 16); } /* * finally, set the valid/checksum/TSO bit in the first |
