Date: Sun, 22 Apr 2007 05:16:14 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 118559 for review Message-ID: <200704220516.l3M5GEMk023489@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=118559 Change 118559 by sam@sam_ebb on 2007/04/22 05:15:31 o treat QoS null data frame identically to non-QoS o replace variable use with known constant o correct typo in debug msg Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#100 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#100 (text+ko) ==== @@ -404,7 +404,8 @@ m = ieee80211_decap(ic, m, hdrspace); if (m == NULL) { /* don't count Null data frames as errors */ - if (subtype == IEEE80211_FC0_SUBTYPE_NODATA) + if (subtype == IEEE80211_FC0_SUBTYPE_NODATA || + subtype == IEEE80211_FC0_SUBTYPE_QOS_NULL) goto out; IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT, ni->ni_macaddr, "data", "%s", "decap error"); @@ -461,7 +462,7 @@ ni->ni_macaddr, "fast-frame", "%s", "m_pullup(llc) failed"); ic->ic_stats.is_rx_tooshort++; - return type; + return IEEE80211_FC0_TYPE_DATA; } llc = (struct llc *)(mtod(m, u_int8_t *) + sizeof(struct ether_header)); @@ -469,7 +470,7 @@ m_adj(m, FF_LLC_SIZE); m = ieee80211_decap_fastframe(ic, ni, m); if (m == NULL) - return type; + return IEEE80211_FC0_TYPE_DATA; } } #undef FF_LLC_SIZE @@ -536,7 +537,7 @@ bpf_mtap(ic->ic_rawbpf, m); (*ic->ic_recv_mgmt)(ic, m, ni, subtype, rssi, noise, rstamp); m_freem(m); - return type; + return IEEE80211_FC0_TYPE_MGT; case IEEE80211_FC0_TYPE_CTL: ic->ic_stats.is_rx_ctl++; @@ -1953,7 +1954,7 @@ struct ieee80211com *ic = ni->ni_ic; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, - "[%s] deny %s request, %srate set mismatch, rate 0x%x\n", + "[%s] deny %s request, %s rate set mismatch, rate 0x%x\n", ether_sprintf(wh->i_addr2), reassoc ? "reassoc" : "assoc", tag, rate); IEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_BASIC_RATE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704220516.l3M5GEMk023489>