28c28
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 190678 2009-04-03 20:46:32Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 190850 2009-04-08 16:19:50Z sam $");
256,263c256,265
< /*
< * Encapsulate the packet in prep for transmission.
< */
< m = ieee80211_encap(vap, ni, m);
< if (m == NULL) {
< /* NB: stat+msg handled in ieee80211_encap */
< ieee80211_free_node(ni);
< continue;
---
> if (__predict_true((vap->iv_caps & IEEE80211_C_8023ENCAP) == 0)) {
> /*
> * Encapsulate the packet in prep for transmission.
> */
> m = ieee80211_encap(vap, ni, m);
> if (m == NULL) {
> /* NB: stat+msg handled in ieee80211_encap */
> ieee80211_free_node(ni);
> continue;
> }