diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-26 19:38:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-26 19:38:53 -0400 |
| commit | fe9066ade6a42a6f0bd22333e5831194104713ce (patch) | |
| tree | 0b295f1663091a1de2e6ae1cdcca74d776a193aa /net/caif | |
| parent | 5f59102fdcfeee937439bb4a5e5c9dbc0d6eb4b0 (diff) | |
| parent | f9dca80b98caac8b4bfb43a2edf1e9f877ccf322 (diff) | |
Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
We have three more fixes:
* AP_VLAN tailroom calculation fix, the bug leads to warnings
along with dropped packets
* NAPI context issue, calling napi_gro_receive() from a timer
(obviously) can lead to crashes
* remain-on-channel combining leads to dropped requests and not
being able to finish certain operations, so remove it
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions