summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Longeau <chl@cvs.openbsd.org>2011-04-15 15:12:28 +0000
committerCharles Longeau <chl@cvs.openbsd.org>2011-04-15 15:12:28 +0000
commit3479b8c882e63841c796c4d7227d74dee20ec6ed (patch)
tree03970693ac18b7d11c93d1eacbbc9254228e1e43
parent7f1e51af0cab7f3c5eadb636a2beae227cd5e0f5 (diff)
Remove dead assignments and one newly created unused variable.
Found by LLVM/Clang Static Analyzer. ok henning@ krw@ claudio@
-rw-r--r--sys/dev/pci/if_ix.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 2cc1f905c20..8a2d5488ba5 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ix.c,v 1.50 2011/04/13 00:14:18 dlg Exp $ */
+/* $OpenBSD: if_ix.c,v 1.51 2011/04/15 15:12:27 chl Exp $ */
/******************************************************************************
@@ -863,7 +863,7 @@ ixgbe_encap(struct tx_ring *txr, struct mbuf *m_head)
struct ix_softc *sc = txr->sc;
uint32_t olinfo_status = 0, cmd_type_len = 0;
int i, j, error;
- int first, last = 0;
+ int first;
bus_dmamap_t map;
struct ixgbe_tx_buf *txbuf, *txbuf_mapped;
union ixgbe_adv_tx_desc *txd = NULL;
@@ -954,7 +954,6 @@ ixgbe_encap(struct tx_ring *txr, struct mbuf *m_head)
txd->read.cmd_type_len = htole32(txr->txd_cmd |
cmd_type_len | map->dm_segs[j].ds_len);
txd->read.olinfo_status = htole32(olinfo_status);
- last = i; /* Next descriptor that will get completed */
if (++i == sc->num_tx_desc)
i = 0;
@@ -1587,7 +1586,6 @@ ixgbe_allocate_queues(struct ix_softc *sc)
error = ENOMEM;
goto fail;
}
- txr = sc->tx_rings;
/* Next allocate the RX */
if (!(sc->rx_rings =
@@ -1597,7 +1595,6 @@ ixgbe_allocate_queues(struct ix_softc *sc)
error = ENOMEM;
goto rx_fail;
}
- rxr = sc->rx_rings;
/* For the ring itself */
tsize = roundup2(sc->num_tx_desc *