summaryrefslogtreecommitdiffstats
path: root/sys/dev/isa
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-06-24 09:40:53 +0000
committermpi <mpi@openbsd.org>2015-06-24 09:40:53 +0000
commitdb4dc9aafbed936e879d4362ca141e998a6e925c (patch)
treedf98e73a3cab3c7738c665fd003541280cfc7446 /sys/dev/isa
parentIntroduce Linux work queue APIs and use them. As a side-effect, this will (diff)
downloadwireguard-openbsd-db4dc9aafbed936e879d4362ca141e998a6e925c.tar.xz
wireguard-openbsd-db4dc9aafbed936e879d4362ca141e998a6e925c.zip
Increment if_ipackets in if_input().
Note that pseudo-drivers not using if_input() are not affected by this conversion. ok mikeb@, kettenis@, claudio@, dlg@
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/if_ef_isapnp.c4
-rw-r--r--sys/dev/isa/if_eg.c4
-rw-r--r--sys/dev/isa/if_el.c4
-rw-r--r--sys/dev/isa/if_ex.c3
-rw-r--r--sys/dev/isa/if_ie.c3
5 files changed, 5 insertions, 13 deletions
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index 18508c38fa2..24fcada01f4 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ef_isapnp.c,v 1.28 2015/05/19 11:24:01 mpi Exp $ */
+/* $OpenBSD: if_ef_isapnp.c,v 1.29 2015/06/24 09:40:54 mpi Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -719,9 +719,7 @@ efread(sc)
return;
}
- ifp->if_ipackets++;
ml_enqueue(&ml, m);
-
if_input(ifp, &ml);
}
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 45ee45cea6a..f4a348016dd 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_eg.c,v 1.38 2015/05/19 11:24:01 mpi Exp $ */
+/* $OpenBSD: if_eg.c,v 1.39 2015/06/24 09:40:54 mpi Exp $ */
/* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */
/*
@@ -688,9 +688,7 @@ egread(struct eg_softc *sc, caddr_t buf, int len)
return;
}
- ifp->if_ipackets++;
ml_enqueue(&ml, m);
-
if_input(ifp, &ml);
}
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 744ece69ad9..637368398f1 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_el.c,v 1.26 2015/05/19 11:24:01 mpi Exp $ */
+/* $OpenBSD: if_el.c,v 1.27 2015/06/24 09:40:54 mpi Exp $ */
/* $NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $ */
/*
@@ -508,9 +508,7 @@ elread(sc, len)
return;
}
- ifp->if_ipackets++;
ml_enqueue(&ml, m);
-
if_input(ifp, &ml);
}
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index 3366ffe80d9..7f1f7c4091f 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ex.c,v 1.38 2015/05/19 11:24:01 mpi Exp $ */
+/* $OpenBSD: if_ex.c,v 1.39 2015/06/24 09:40:54 mpi Exp $ */
/*
* Copyright (c) 1997, Donald A. Schmidt
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -710,7 +710,6 @@ ex_rx_intr(struct ex_softc *sc)
} /* QQQ */
}
#endif
- ifp->if_ipackets++;
ml_enqueue(&ml, ipkt);
}
} else
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 932e12743e8..7457b0aeb58 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.42 2015/05/26 11:23:15 mpi Exp $ */
+/* $OpenBSD: if_ie.c,v 1.43 2015/06/24 09:40:54 mpi Exp $ */
/* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */
/*-
@@ -1314,7 +1314,6 @@ ie_readframe(sc, num)
ml_enqueue(&ml, m);
if_input(&sc->sc_arpcom.ac_if, &ml);
- sc->sc_arpcom.ac_if.if_ipackets++;
}
void