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/dev/nge | |
| 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/dev/nge')
| -rw-r--r-- | sys/dev/nge/if_nge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 70d99bd..74f8f9a 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -1229,7 +1229,9 @@ nge_rxeof(sc) */ if (extsts & NGE_RXEXTSTS_VLANPKT) { VLAN_INPUT_TAG(ifp, m, - ntohs(extsts & NGE_RXEXTSTS_VTCI), continue); + ntohs(extsts & NGE_RXEXTSTS_VTCI)); + if (m == NULL) + continue; } NGE_UNLOCK(sc); (*ifp->if_input)(ifp, m); |
