diff options
author | glebius <glebius@FreeBSD.org> | 2005-12-18 18:24:27 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2005-12-18 18:24:27 +0000 |
commit | 175e16aa4df4f5510a7a395b24bd5ac9a00145f9 (patch) | |
tree | edde4e6e448953c23a09236086ca19000c7a4fb5 /sys/net80211 | |
parent | 035fda79903772207b9132abc6ed91ac80535900 (diff) | |
download | FreeBSD-src-175e16aa4df4f5510a7a395b24bd5ac9a00145f9.zip FreeBSD-src-175e16aa4df4f5510a7a395b24bd5ac9a00145f9.tar.gz |
- Fix VLAN_INPUT_TAG() macro, so that it doesn't touch mtag in
case if memory allocation failed.
- Remove fourth argument from VLAN_INPUT_TAG(), that was used
incorrectly in almost all drivers. Indicate failure with
mbuf value of NULL.
In collaboration with: yongari, ru, sam
Diffstat (limited to 'sys/net80211')
-rw-r--r-- | sys/net80211/ieee80211_input.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 80a64d7..5e3b2f7 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -710,8 +710,9 @@ ieee80211_deliver_data(struct ieee80211com *ic, if (m != NULL) { if (ni->ni_vlan != 0) { /* attach vlan tag */ - /* XXX goto err? */ - VLAN_INPUT_TAG(ifp, m, ni->ni_vlan, goto out); + VLAN_INPUT_TAG(ifp, m, ni->ni_vlan); + if (m == NULL) + goto out; /* XXX goto err? */ } (*ifp->if_input)(ifp, m); } |