Date: Wed, 5 Mar 2003 14:52:36 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26399 for review Message-ID: <200303052252.h25Mqavp007469@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26399 Change 26399 by sam@sam_ebb on 2003/03/05 14:52:28 IFC Affected files ... .. //depot/projects/wlan/sys/dev/wi/if_wi.c#4 edit Differences ... ==== //depot/projects/wlan/sys/dev/wi/if_wi.c#4 (text+ko) ==== @@ -113,7 +113,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.127 2003/01/21 08:55:45 alfred Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.130 2003/02/26 17:18:35 sam Exp $"; #endif static void wi_start(struct ifnet *); @@ -174,9 +174,9 @@ static struct timeval lasttxerror; /* time of last tx error msg */ static int curtxeps; /* current tx error msgs/sec */ -static int wi_txerate = -1; /* tx error rate: max msgs/sec */ +static int wi_txerate = 0; /* tx error rate: max msgs/sec */ SYSCTL_INT(_hw_wi, OID_AUTO, txerate, CTLFLAG_RW, &wi_txerate, - 0, "max tx error msgs/sec; -1 disables msgs"); + 0, "max tx error msgs/sec; 0 to disable msgs"); #define WI_DEBUG #ifdef WI_DEBUG @@ -782,8 +782,8 @@ if_printf(ifp, "interface not running\n"); wi_stop(ifp, 0); } + WI_UNLOCK(sc); DPRINTF(("wi_init: return %d\n", error)); - WI_UNLOCK(sc); return; } @@ -916,9 +916,9 @@ if (sc->sc_drvbpf) { struct mbuf *mb; - MGETHDR(mb, M_NOWAIT, m0->m_type); + MGETHDR(mb, M_DONTWAIT, m0->m_type); if (mb != NULL) { - (void) m_dup_pkthdr(mb, m0, M_NOWAIT); + (void) m_dup_pkthdr(mb, m0, M_DONTWAIT); mb->m_next = m0; mb->m_data = (caddr_t)&frmhdr; mb->m_len = sizeof(frmhdr); @@ -1345,15 +1345,7 @@ len = le16toh(frmhdr.wi_dat_len); off = ALIGN(sizeof(struct ieee80211_frame)); - if (off + len > MCLBYTES) { - CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); - ifp->if_ierrors++; - DPRINTF(("wi_rx_intr: oversized packet (off %u len %u)\n", - off, len)); - return; - } - - MGETHDR(m, M_NOWAIT, MT_DATA); + MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); ifp->if_ierrors++; @@ -1361,7 +1353,7 @@ return; } if (off + len > MHLEN) { - MCLGET(m, M_NOWAIT); + MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); m_freem(m); @@ -1384,9 +1376,9 @@ if (sc->sc_drvbpf) { struct mbuf *mb; - MGETHDR(mb, M_NOWAIT, m->m_type); + MGETHDR(mb, M_DONTWAIT, m->m_type); if (mb != NULL) { - (void) m_dup_pkthdr(mb, m, M_NOWAIT); + (void) m_dup_pkthdr(mb, m, M_DONTWAIT); mb->m_next = m; mb->m_data = (caddr_t)&frmhdr; mb->m_len = sizeof(frmhdr); @@ -1504,7 +1496,6 @@ fid = CSR_READ_2(sc, WI_INFO_FID); wi_read_bap(sc, fid, 0, ltbuf, sizeof(ltbuf)); - DPRINTF(("wi_info_intr: type 0x%x\n", le16toh(ltbuf[1]))); switch (le16toh(ltbuf[1])) { case WI_INFO_LINK_STAT: @@ -1927,7 +1918,7 @@ error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) return error; - len = wreq.wi_len ? (wreq.wi_len - 1) * 2 : 0; + len = (wreq.wi_len - 1) * 2; switch (wreq.wi_type) { case WI_RID_DBM_ADJUST: return ENODEV; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303052252.h25Mqavp007469>