- Remove empty wrappers ether_poll_[de]register_drv(). [1]

- Move polling(9) declarations out of ifq.h back to if_var.h
  they are absolutely unrelated to queues.

Submitted by:	Mikhail <mp lenta.ru> [1]

1 files changed, 2 insertions, 15 deletions

diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index f8bc8009c32d..04b4e7936a1e 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -451,19 +451,6 @@ netisr_poll(void)
 	mtx_unlock(&poll_mtx);
 }
 
-/* The following should be temporary, till all drivers use the driver API */
-int
-ether_poll_register_drv(poll_handler_drv_t *h, if_t ifh)
-{
-	return (ether_poll_register((poll_handler_t *)h, (struct ifnet *)ifh));
-}
-
-int
-ether_poll_deregister_drv(if_t ifh)
-{
-	return (ether_poll_deregister((struct ifnet *)ifh));
-}
-
 /*
  * Try to register routine for polling. Returns 0 if successful
  * (and polling should be enabled), error code otherwise.
@@ -472,7 +459,7 @@ ether_poll_deregister_drv(if_t ifh)
  * This is called from within the *_ioctl() functions.
  */
 int
-ether_poll_register(poll_handler_t *h, struct ifnet *ifp)
+ether_poll_register(poll_handler_t *h, if_t ifp)
 {
 	int i;
 
@@ -519,7 +506,7 @@ ether_poll_register(poll_handler_t *h, struct ifnet *ifp)
  * Remove interface from the polling list. Called from *_ioctl(), too.
  */
 int
-ether_poll_deregister(struct ifnet *ifp)
+ether_poll_deregister(if_t ifp)
 {
 	int i;