Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The service queue isn't used anymore so don't allocate it.

Browse Source 
It saves a bit of memory and reduces diff with other BSD.
This commit is contained in:
degroote 2007-09-02 12:18:05 +00:00
parent 420d610664
commit 6471b574ca
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/pci/if_wpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wpi.c,v 1.23 2007/09/02 11:37:30 degroote Exp $ */
/* $NetBSD: if_wpi.c,v 1.24 2007/09/02 12:18:05 degroote Exp $ */
/*-
* Copyright (c) 2006, 2007
@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.23 2007/09/02 11:37:30 degroote Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.24 2007/09/02 12:18:05 degroote Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@ -296,17 +296,10 @@ wpi_attach(struct device *parent __unused, struct device *self, void *aux)
goto fail3;
}
error = wpi_alloc_tx_ring(sc, &sc->svcq, WPI_SVC_RING_COUNT, 5);
if (error != 0) {
aprint_error("%s: could not allocate service ring\n",
sc->sc_dev.dv_xname);
goto fail4;
}
if (wpi_alloc_rx_ring(sc, &sc->rxq) != 0) {
aprint_error("%s: could not allocate Rx ring\n",
sc->sc_dev.dv_xname);
goto fail5;
goto fail4;
}
ic->ic_ifp = ifp;
@ -380,7 +373,6 @@ wpi_attach(struct device *parent __unused, struct device *self, void *aux)
return;
fail5: wpi_free_tx_ring(sc, &sc->svcq);
fail4: wpi_free_tx_ring(sc, &sc->cmdq);
fail3: while (--ac >= 0)
wpi_free_tx_ring(sc, &sc->txq[ac]);
@ -409,7 +401,6 @@ wpi_detach(struct device* self, int flags __unused)
for (ac = 0; ac < 4; ac++)
wpi_free_tx_ring(sc, &sc->txq[ac]);
wpi_free_tx_ring(sc, &sc->cmdq);
wpi_free_tx_ring(sc, &sc->svcq);
wpi_free_rx_ring(sc, &sc->rxq);
wpi_free_rpool(sc);
wpi_free_shared(sc);
@ -3185,7 +3176,6 @@ wpi_stop(struct ifnet *ifp, int disable)
for (ac = 0; ac < 4; ac++)
wpi_reset_tx_ring(sc, &sc->txq[ac]);
wpi_reset_tx_ring(sc, &sc->cmdq);
wpi_reset_tx_ring(sc, &sc->svcq);
/* reset Rx ring */
wpi_reset_rx_ring(sc, &sc->rxq);

3
sys/dev/pci/if_wpireg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wpireg.h,v 1.5 2007/07/18 18:49:17 degroote Exp $ */
/* $NetBSD: if_wpireg.h,v 1.6 2007/09/02 12:18:05 degroote Exp $ */
/*-
* Copyright (c) 2006
@ -18,7 +18,6 @@
*/
#define WPI_TX_RING_COUNT 256
#define WPI_SVC_RING_COUNT 256
#define WPI_CMD_RING_COUNT 256
#define WPI_RX_RING_COUNT 64

3
sys/dev/pci/if_wpivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wpivar.h,v 1.7 2007/09/02 11:37:30 degroote Exp $ */
/* $NetBSD: if_wpivar.h,v 1.8 2007/09/02 12:18:05 degroote Exp $ */
/*-
* Copyright (c) 2006
@ -144,7 +144,6 @@ struct wpi_softc {
struct wpi_tx_ring txq[4];
struct wpi_tx_ring cmdq;
struct wpi_tx_ring svcq;
struct wpi_rx_ring rxq;
bus_space_tag_t sc_st;