The upstream code was missing part of a receive/error race fix from
the internal tree.  Add the missing part, which makes future merges
possible.
Signed-off-by: NMike Marciniszyn <mike.marciniszyn@qlogic.com>
Signed-off-by: NRoland Dreier <rolandd@cisco.com>