mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker driver, nothing serious. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
b079115937
200 changed files with 1392 additions and 881 deletions
|
|
@ -870,7 +870,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
|
|||
QEDI_ERR(&qedi->dbg_ctx,
|
||||
"Delayed or untracked cleanup response, itt=0x%x, tid=0x%x, cid=0x%x, task=%p\n",
|
||||
protoitt, cqe->itid, qedi_conn->iscsi_conn_id, task);
|
||||
WARN_ON(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1499,11 +1499,9 @@ err_idx:
|
|||
|
||||
void qedi_clear_task_idx(struct qedi_ctx *qedi, int idx)
|
||||
{
|
||||
if (!test_and_clear_bit(idx, qedi->task_idx_map)) {
|
||||
if (!test_and_clear_bit(idx, qedi->task_idx_map))
|
||||
QEDI_ERR(&qedi->dbg_ctx,
|
||||
"FW task context, already cleared, tid=0x%x\n", idx);
|
||||
WARN_ON(1);
|
||||
}
|
||||
}
|
||||
|
||||
void qedi_update_itt_map(struct qedi_ctx *qedi, u32 tid, u32 proto_itt,
|
||||
|
|
|
|||
Loading…
Reference in a new issue