A system includes a channel estimator configured to receive a plurality of Orthogonal Frequency Division Multiplexing (OFDM) symbols via a plurality of respective antennas, and generate estimates of a channel based on the plurality of OFDM symbols. A demodulator is configured to generate a plurality of demodulated symbols based on the plurality of OFDM symbols and the estimates of the channel. A decoder is configured to receive the estimates of the channel from the channel estimator, receive the plurality of demodulated symbols from the demodulator, and calculate decision metrics for the plurality of OFDM symbols using both the estimates of the channel and the plurality of demodulated symbols.