diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-18 01:25:24 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-18 01:25:24 +0400 |
| commit | a7c12639bdf571a09578aed626875848d209d24f (patch) | |
| tree | 41b523a9c9130eb53c50de48764c79ce6e29066d /net/netfilter/nfnetlink_log.c | |
| parent | 7022ef8b2a673db3d12a348331181f579afe9b22 (diff) | |
| parent | 0951c5c214e525185572204b587e3b6762d121f4 (diff) | |
| download | linux-a7c12639bdf571a09578aed626875848d209d24f.tar.xz | |
Merge branch 'qlcnic'
Himanshu Madhani says:
====================
qlcnic: Bug fixes.
This series contains bug fixes for mailbox handling and multi Tx queue support
for all supported adapters.
changes from v1 -> v2
o updated patch to fix usage of netif_tx_{wake,stop} api during link change
as per David Miller's suggestion.
o Dropped patch to use spinklock per tx queue for more work.
o Added reworked patch for memory allocation failures.
o Added patch to allow capturing of dump, when auto recovery is disabled in firmware.
o Added patches for mailbox interrupt handling and debugging data for mailbox failure.
Please apply to net.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
0 files changed, 0 insertions, 0 deletions