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/txp | |
| 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/txp')
| -rw-r--r-- | sys/dev/txp/if_txp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index 6f3429e..ae22015 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -766,8 +766,9 @@ txp_rx_reclaim(sc, r) } if (rxd->rx_stat & RX_STAT_VLAN) { - VLAN_INPUT_TAG(ifp, - m, htons(rxd->rx_vlan >> 16), goto next); + VLAN_INPUT_TAG(ifp, m, htons(rxd->rx_vlan >> 16)); + if (m == NULL) + goto next; } TXP_UNLOCK(sc); |
