diff options
Diffstat (limited to 'sys/net/if_atmsubr.c')
| -rw-r--r-- | sys/net/if_atmsubr.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index 1350f5a..07df91c 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -256,9 +256,6 @@ atm_input(struct ifnet *ifp, struct atm_pseudohdr *ah, struct mbuf *m, { int isr; u_int16_t etype = ETHERTYPE_IP; /* default */ -#ifdef NATM - int s; -#endif if ((ifp->if_flags & IFF_UP) == 0) { m_freem(m); @@ -284,13 +281,19 @@ atm_input(struct ifnet *ifp, struct atm_pseudohdr *ah, struct mbuf *m, if (rxhand) { #ifdef NATM - struct natmpcb *npcb = rxhand; + struct natmpcb *npcb; - s = splimp(); /* in case 2 atm cards @ diff lvls */ + /* + * XXXRW: this use of 'rxhand' is not a very good idea, and + * was subject to races even before SMPng due to the release + * of spl here. + */ + NATM_LOCK(); + npcb = rxhand; npcb->npcb_inq++; /* count # in queue */ - splx(s); isr = NETISR_NATM; m->m_pkthdr.rcvif = rxhand; /* XXX: overload */ + NATM_UNLOCK(); #else printf("atm_input: NATM detected but not " "configured in kernel\n"); |
