summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2005-12-14 22:08:21 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2005-12-14 22:08:21 +0000
commit3b72fec090a7a67006c8f1b0a7760fe69aaabae4 (patch)
tree5c54286a1a72db3bd53a6625fa271b1c2a20ca56
parent2ec6b4421ab11d77401c2c6d082e69b79fe0f729 (diff)
We aren't likely to need to keep track of crypted/decrypted ring
bits any time soon... pointed out by damien@
-rw-r--r--sys/dev/pci/if_nfe.c6
-rw-r--r--sys/dev/pci/if_nfevar.h5
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 5c34253fffc..643e900660a 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nfe.c,v 1.1 2005/12/14 21:54:57 jsg Exp $ */
+/* $OpenBSD: if_nfe.c,v 1.2 2005/12/14 22:08:20 jsg Exp $ */
/*
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
*
@@ -561,7 +561,6 @@ nfe_alloc_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring, int count)
ring->count = count;
ring->cur = ring->next = 0;
- ring->cur_decrypt = 0;
error = bus_dmamap_create(sc->sc_dmat, count * descsize, 1,
count * descsize, 0, BUS_DMA_NOWAIT, &ring->map);
@@ -694,7 +693,6 @@ nfe_reset_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring)
BUS_DMASYNC_PREWRITE);
ring->cur = ring->next = 0;
- ring->cur_decrypt = 0;
}
void
@@ -765,7 +763,6 @@ nfe_alloc_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring, int count)
ring->count = count;
ring->queued = 0;
ring->cur = ring->next = 0;
- ring->cur_encrypt = ring->next_encrypt = 0;
error = bus_dmamap_create(sc->sc_dmat, count * descsize, 1,
count * descsize, 0, BUS_DMA_NOWAIT, &ring->map);
@@ -865,7 +862,6 @@ nfe_reset_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
ring->queued = 0;
ring->cur = ring->next = 0;
- ring->cur_encrypt = ring->next_encrypt = 0;
}
void
diff --git a/sys/dev/pci/if_nfevar.h b/sys/dev/pci/if_nfevar.h
index 5ae84fa5a22..4a76db2e7e9 100644
--- a/sys/dev/pci/if_nfevar.h
+++ b/sys/dev/pci/if_nfevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nfevar.h,v 1.1 2005/12/14 21:54:58 jsg Exp $ */
+/* $OpenBSD: if_nfevar.h,v 1.2 2005/12/14 22:08:20 jsg Exp $ */
/*
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
*
@@ -33,8 +33,6 @@ struct nfe_tx_ring {
int queued;
int cur;
int next;
- int cur_encrypt;
- int next_encrypt;
};
struct nfe_rx_data {
@@ -53,7 +51,6 @@ struct nfe_rx_ring {
int count;
int cur;
int next;
- int cur_decrypt;
};
struct nfe_softc {