summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2007-04-17 14:12:06 +0000
committerskrll <skrll@NetBSD.org>2007-04-17 14:12:06 +0000
commita3ff9cc3ffefe9a3a0adc645983ec2b5a7e6b636 (patch)
tree5f4a3412c31e62d4d6484a65abf656b022637602 /sys/dev
parentc7e599195dd15e9cbddfddf5ad07c1d9764af50a (diff)
Remove bogus if_drain. If an attempt to reclaim mbufs was made the
interface was marked down. Should fix PR 31540.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/i82596.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 99387200538..a831cceec7a 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82596.c,v 1.15 2007/03/04 06:01:56 christos Exp $ */
+/* $NetBSD: i82596.c,v 1.16 2007/04/17 14:12:06 skrll Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.15 2007/03/04 06:01:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.16 2007/04/17 14:12:06 skrll Exp $");
/* autoconfig and device stuff */
#include <sys/param.h>
@@ -94,7 +94,6 @@ static int iee_ioctl(struct ifnet *, u_long, void *); /* ioctl routine */
static int iee_init(struct ifnet *); /* init routine */
static void iee_stop(struct ifnet *, int); /* stop routine */
static void iee_watchdog(struct ifnet *); /* timer routine */
-static void iee_drain(struct ifnet *); /* release resources */
/* internal helper functions */
static void iee_cb_setup(struct iee_softc *, uint32_t);
@@ -536,7 +535,6 @@ iee_attach(struct iee_softc *sc, uint8_t *eth_addr, int *media, int nmedia,
ifp->if_init = iee_init; /* init routine */
ifp->if_stop = iee_stop; /* stop routine */
ifp->if_watchdog = iee_watchdog; /* timer routine */
- ifp->if_drain = iee_drain; /* routine to release resources */
IFQ_SET_READY(&ifp->if_snd);
/* iee supports IEEE 802.1Q Virtual LANs, see vlan(4). */
sc->sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
@@ -930,13 +928,3 @@ iee_watchdog(struct ifnet *ifp)
iee_init(ifp);
return;
}
-
-
-
-/* routine to release res. */
-void
-iee_drain(struct ifnet *ifp)
-{
- iee_stop(ifp, 0);
- return;
-}