Skip to content
Snippets Groups Projects
Commit d0e99511 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge wireless into wireless-next 

Due to the two cherry picked commits from wireless to wireless-next we have
several conflicts in mt76. To avoid any bugs with conflicts merge wireless into
wireless-next.

96f134dc wifi: mt76: handle possible mt76_rx_token_consume failures
fe13dad8 wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails
parents de7d0ff3 80f8a66d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 604 additions and 20 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment