summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authornp <np@FreeBSD.org>2012-10-10 16:52:39 +0000
committernp <np@FreeBSD.org>2012-10-10 16:52:39 +0000
commit83aa88517ca874ca46e9f752787e2d515dc22b87 (patch)
tree07bf592e1c0d554337142ef47e0689d333ba54b6 /sys
parent34debbc87e9c47e2ddd94fe8c497460ba1f49d6f (diff)
downloadFreeBSD-src-83aa88517ca874ca46e9f752787e2d515dc22b87.zip
FreeBSD-src-83aa88517ca874ca46e9f752787e2d515dc22b87.tar.gz
Remove unused item. cxgbe's rx queue's lock was removed a long time ago.
MFC after: 3 days
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/cxgbe/adapter.h1
-rw-r--r--sys/dev/cxgbe/t4_sge.c17
2 files changed, 5 insertions, 13 deletions
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 71f0fe9..9320273 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -282,7 +282,6 @@ struct sge_iq {
bus_dma_tag_t desc_tag;
bus_dmamap_t desc_map;
bus_addr_t ba; /* bus address of descriptor ring */
- char lockname[16];
uint32_t flags;
uint16_t abs_id; /* absolute SGE id for the iq */
int8_t intr_pktc_idx; /* packet count threshold index */
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 811819f..8b01d9d 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -120,7 +120,7 @@ static struct mbuf *get_fl_payload(struct adapter *, struct sge_fl *, uint32_t,
int *);
static int t4_eth_rx(struct sge_iq *, const struct rss_header *, struct mbuf *);
static inline void init_iq(struct sge_iq *, struct adapter *, int, int, int,
- int, char *);
+ int);
static inline void init_fl(struct sge_fl *, int, int, char *);
static inline void init_eq(struct sge_eq *, int, int, uint8_t, uint16_t,
char *);
@@ -595,10 +595,8 @@ t4_setup_port_queues(struct port_info *pi)
*/
for_each_rxq(pi, i, rxq) {
- snprintf(name, sizeof(name), "%s rxq%d-iq",
- device_get_nameunit(pi->dev), i);
init_iq(&rxq->iq, sc, pi->tmr_idx, pi->pktc_idx, pi->qsize_rxq,
- RX_IQ_ESIZE, name);
+ RX_IQ_ESIZE);
snprintf(name, sizeof(name), "%s rxq%d-fl",
device_get_nameunit(pi->dev), i);
@@ -620,10 +618,8 @@ t4_setup_port_queues(struct port_info *pi)
#ifdef TCP_OFFLOAD
for_each_ofld_rxq(pi, i, ofld_rxq) {
- snprintf(name, sizeof(name), "%s ofld_rxq%d-iq",
- device_get_nameunit(pi->dev), i);
init_iq(&ofld_rxq->iq, sc, pi->tmr_idx, pi->pktc_idx,
- pi->qsize_rxq, RX_IQ_ESIZE, name);
+ pi->qsize_rxq, RX_IQ_ESIZE);
snprintf(name, sizeof(name), "%s ofld_rxq%d-fl",
device_get_nameunit(pi->dev), i);
@@ -1478,7 +1474,7 @@ can_resume_tx(struct sge_eq *eq)
static inline void
init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
- int qsize, int esize, char *name)
+ int qsize, int esize)
{
KASSERT(tmr_idx >= 0 && tmr_idx < SGE_NTIMERS,
("%s: bad tmr_idx %d", __func__, tmr_idx));
@@ -1495,7 +1491,6 @@ init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
}
iq->qsize = roundup(qsize, 16); /* See FW_IQ_CMD/iqsize */
iq->esize = max(esize, 16); /* See FW_IQ_CMD/iqesize */
- strlcpy(iq->lockname, name, sizeof(iq->lockname));
}
static inline void
@@ -1793,12 +1788,10 @@ alloc_fwq(struct adapter *sc)
{
int rc, intr_idx;
struct sge_iq *fwq = &sc->sge.fwq;
- char name[16];
struct sysctl_oid *oid = device_get_sysctl_tree(sc->dev);
struct sysctl_oid_list *children = SYSCTL_CHILDREN(oid);
- snprintf(name, sizeof(name), "%s fwq", device_get_nameunit(sc->dev));
- init_iq(fwq, sc, 0, 0, FW_IQ_QSIZE, FW_IQ_ESIZE, name);
+ init_iq(fwq, sc, 0, 0, FW_IQ_QSIZE, FW_IQ_ESIZE);
fwq->flags |= IQ_INTR; /* always */
intr_idx = sc->intr_count > 1 ? 1 : 0;
rc = alloc_iq_fl(sc->port[0], fwq, NULL, intr_idx, -1);
OpenPOWER on IntegriCloud