mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
a655fe9f19
399 changed files with 4109 additions and 1563 deletions
|
|
@ -537,6 +537,8 @@ static void process_response_list(struct nitrox_cmdq *cmdq)
|
|||
struct nitrox_device *ndev = cmdq->ndev;
|
||||
struct nitrox_softreq *sr;
|
||||
int req_completed = 0, err = 0, budget;
|
||||
completion_t callback;
|
||||
void *cb_arg;
|
||||
|
||||
/* check all pending requests */
|
||||
budget = atomic_read(&cmdq->pending_count);
|
||||
|
|
@ -564,13 +566,13 @@ static void process_response_list(struct nitrox_cmdq *cmdq)
|
|||
smp_mb__after_atomic();
|
||||
/* remove from response list */
|
||||
response_list_del(sr, cmdq);
|
||||
|
||||
/* ORH error code */
|
||||
err = READ_ONCE(*sr->resp.orh) & 0xff;
|
||||
|
||||
if (sr->callback)
|
||||
sr->callback(sr->cb_arg, err);
|
||||
callback = sr->callback;
|
||||
cb_arg = sr->cb_arg;
|
||||
softreq_destroy(sr);
|
||||
if (callback)
|
||||
callback(cb_arg, err);
|
||||
|
||||
req_completed++;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue