 @@ -1,14 +1,14 @@
-/*	$NetBSD: xmm7360.c,v 1.15 2022/02/12 15:51:29 thorpej Exp $	*/
+/*	$NetBSD: xmm7360.c,v 1.16 2022/02/12 16:21:27 thorpej Exp $	*/
 /*
  * Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
  * Written by James Wah
  * james@laird-wah.net
+ *
  * Development of this driver was supported by genua GmbH
+ *
  * Copyright (c) 2020 genua GmbH <info@genua.de>
  * Copyright (c) 2020 James Wah <james@laird-wah.net>
+ *
  * The OpenBSD and NetBSD support was written by Jaromir Dolecek for
  * Moritz Systems Technology Company Sp. z o.o.
 @@ -65,27 +65,27 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
 #endif
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 #ifdef __OpenBSD__
 #include "bpfilter.h"
 #endif
 #ifdef __NetBSD__
 #include "opt_inet.h"
 #include "opt_gateway.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.15 2022/02/12 15:51:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.16 2022/02/12 16:21:27 thorpej Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/mutex.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/kthread.h>
 @@ -193,26 +193,31 @@ typedef struct mutex spinlock_t;
 #define __UNVOLATILE(a)		((void *)(unsigned long)(volatile void *)(a))
 #if OpenBSD <= 201911
 /* Backward compat with OpenBSD 6.6 */
 #define klist_insert(klist, kn)		\
 		SLIST_INSERT_HEAD(klist, kn, kn_selnext)
 #define klist_remove(klist, kn)		\
 		SLIST_REMOVE(klist, kn, knote, kn_selnext)
 #define XMM_KQ_ISFD_INITIALIZER		.f_isfd = 1
 #else
 #define XMM_KQ_ISFD_INITIALIZER		.f_flags = FILTEROP_ISFD
 #endif /* OpenBSD <= 201911 */
 #define	selrecord_knote(si, kn)						\
 	klist_insert(&(si)->si_note, (kn))
 #define	selremove_knote(si, kn)						\
 	klist_remove(&(si)->si_note, (kn))
 #endif
 #ifdef __NetBSD__
 typedef struct kmutex spinlock_t;
 #define dev_err			aprint_error_dev
 #define dev_info		aprint_normal_dev
 #define mutex			kmutex
 #define kzalloc(size, flags)	malloc(size, M_DEVBUF, M_WAITOK | M_ZERO)
 #define kfree(addr)		free(addr, M_DEVBUF)
 #define mutex_init(lock)	mutex_init(lock, MUTEX_DEFAULT, IPL_TTY)
 #define mutex_lock(lock)	mutex_enter(lock)
 #define mutex_unlock(lock)	mutex_exit(lock)
 #define spin_lock_irqsave(lock, flags)	mutex_enter(lock)
 @@ -247,27 +252,26 @@ typedef struct kmutex spinlock_t;
 		m0;					\
 })
 #define ifq_deq_rollback(ifq, m)	m_freem(m)
 #define ifq_deq_commit(ifq, m)		/* nothing to do */
 #define ifq_is_oactive(ifq)		true	/* always restart queue */
 #define ifq_clr_oactive(ifq)		/* nothing to do */
 #define ifq_empty(ifq)			IFQ_IS_EMPTY(ifq)
 #define ifq_purge(ifq)			IF_PURGE(ifq)
 #define if_enqueue(ifp, m)		ifq_enqueue(ifp, m)
 #define if_ih_insert(ifp, func, arg)	(ifp)->_if_input = (func)
 #define if_ih_remove(ifp, func, arg)	/* nothing to do */
 #define if_hardmtu			if_mtu
 #define IF_OUTPUT_CONST			const
 #define si_note				sel_klist
 #define XMM_KQ_ISFD_INITIALIZER		.f_flags = FILTEROP_ISFD
 #define tty_lock()			mutex_spin_enter(&tty_lock)
 #define tty_unlock()			mutex_spin_exit(&tty_lock)
 #define tty_locked()			KASSERT(mutex_owned(&tty_lock))
 #define bpfattach(bpf, ifp, dlt, sz)	bpf_attach(ifp, dlt, sz)
 #define NBPFILTER			1
 #define BPF_MTAP_OUT(ifp, m)		bpf_mtap(ifp, m, BPF_D_OUT)
 #endif /* __NetBSD__ */
 #define __user				/* nothing */
 #define copy_from_user(kbuf, userbuf, sz)		\
 ({							\
 	int __ret = 0;					\
 @@ -2740,54 +2744,54 @@ out:
                 if (events & (POLLOUT | POLLWRNORM))
                         selrecord(p, &sc->sc_selw);
+	}
 	return mask & events;
+}
 static void
 filt_wwancrdetach(struct knote *kn)
+{
 	struct queue_pair *qp = (struct queue_pair *)kn->kn_hook;
 	tty_lock();
-	klist_remove(&qp->selr.si_note, kn);
+	selremove_knote(&qp->selr, kn);
 	tty_unlock();
+}
 static int
 filt_wwancread(struct knote *kn, long hint)
+{
 	struct queue_pair *qp = (struct queue_pair *)kn->kn_hook;
 	kn->kn_data = 0;
 	if (!qp->open) {
 		knote_set_eof(kn, 0);
 		return (1);
 	} else {
 		kn->kn_data = xmm7360_qp_has_data(qp) ? 1 : 0;
+	}
 	return (kn->kn_data > 0);
+}
 static void
 filt_wwancwdetach(struct knote *kn)
+{
 	struct queue_pair *qp = (struct queue_pair *)kn->kn_hook;
 	tty_lock();
-	klist_remove(&qp->selw.si_note, kn);
+	selremove_knote(&qp->selw, kn);
 	tty_unlock();
+}
 static int
 filt_wwancwrite(struct knote *kn, long hint)
+{
 	struct queue_pair *qp = (struct queue_pair *)kn->kn_hook;
 	kn->kn_data = 0;
 	if (qp->open) {
 		if (xmm7360_qp_can_write(qp))
 			kn->kn_data = qp->page_size;
 @@ -2806,50 +2810,50 @@ static const struct filterops wwancread_
 static const struct filterops wwancwrite_filtops = {
 	XMM_KQ_ISFD_INITIALIZER,
 	.f_attach	= NULL,
 	.f_detach	= filt_wwancwdetach,
 	.f_event	= filt_wwancwrite,
 };
 int
 wwanckqfilter(dev_t dev, struct knote *kn)
+{
 	struct wwanc_softc *sc = device_lookup_private(&wwanc_cd, DEVUNIT(dev));
 	int func = DEVFUNC(dev);
 	struct queue_pair *qp = &sc->sc_xmm.qp[func];
-	struct klist *klist;
+	struct selinfo *si;
 	if (DEV_IS_TTY(func))
 		return ttkqfilter(dev, kn);
 	KASSERT(!DEV_IS_TTY(func));
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &qp->selr.si_note;
+		si = &qp->selr;
 		kn->kn_fop = &wwancread_filtops;
 		break;
 	case EVFILT_WRITE:
-		klist = &qp->selw.si_note;
+		si = &qp->selw;
 		kn->kn_fop = &wwancwrite_filtops;
 		break;
 	default:
 		return (EINVAL);
+	}
 	kn->kn_hook = (void *)qp;
 	tty_lock();
-	klist_insert(klist, kn);
+	selrecord_knote(si, kn);
 	tty_unlock();
 	return (0);
+}
 static void *
 dma_alloc_coherent(struct device *self, size_t sz, dma_addr_t *physp, int flags)
+{
 	struct wwanc_softc *sc = device_private(self);
 	bus_dma_segment_t seg;
 	int nsegs;
 	int error;
 	caddr_t kva;