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/ti | |
| 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/ti')
| -rw-r--r-- | sys/dev/ti/if_ti.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index a21191b..5b26e63 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -2727,8 +2727,11 @@ ti_rxeof(sc) * If we received a packet with a vlan tag, * tag it before passing the packet upward. */ - if (have_tag) - VLAN_INPUT_TAG(ifp, m, vlan_tag, continue); + if (have_tag) { + VLAN_INPUT_TAG(ifp, m, vlan_tag); + if (m == NULL) + continue; + } TI_UNLOCK(sc); (*ifp->if_input)(ifp, m); TI_LOCK(sc); |
