diff options
| author |   Sathya Perla <sathya.perla@emulex.com> | 2013-02-12 23:05:19 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-02-13 13:52:55 -0500 |
| commit | 9e9ff4b766e25624198b623fe3eda0b3e6c669cd (patch) | |
| tree | 9a00f42e0dab442195e7ca290adc7678d18099d3 | |
| parent | net: ethernet: ti: remove redundant NULL check. (diff) | |
| download | linux-dev-9e9ff4b766e25624198b623fe3eda0b3e6c669cd.tar.xz linux-dev-9e9ff4b766e25624198b623fe3eda0b3e6c669cd.zip | |
be2net: remove BUG_ON() in be_mcc_compl_is_new()
The current code expects that the last word (with valid bit)
of an MCC compl is DMAed in one shot. This may not be the case.
Remove this assertion.
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_cmds.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 8b04880ee05d..071aea79d218 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -93,13 +93,16 @@ static void be_mcc_notify(struct be_adapter *adapter) * little endian) */ static inline bool be_mcc_compl_is_new(struct be_mcc_compl *compl) { + u32 flags; + if (compl->flags != 0) { - compl->flags = le32_to_cpu(compl->flags); - BUG_ON((compl->flags & CQE_FLAGS_VALID_MASK) == 0); - return true; - } else { - return false; + flags = le32_to_cpu(compl->flags); + if (flags & CQE_FLAGS_VALID_MASK) { + compl->flags = flags; + return true; + } } + return false; } /* Need to reset the entire word that houses the valid bit */ |