diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-24 19:34:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-24 19:34:12 -0400 |
| commit | 204cd4f4957eaaecf0d55cdb329d488348745540 (patch) | |
| tree | 30c20974870362439072c2a6ade338d97b1675b6 /net/netfilter/nf_nat_core.c | |
| parent | 01f27fc085574b301248d4da241e9d5ebd61e5c9 (diff) | |
| parent | f6689d9229cb868fae57a8e453acf14d4ad8fd21 (diff) | |
Merge branch 'qlcnic'
Jitendra Kalsaria says:
====================
This set of patches has following updates:
* Enhanced channel configuration logs by adding logs for various cases.
* Take EPORT out of reset before disabling pause frame generation in the
adapter.
* Add eSwitch statistics support in ethtool stats.
* Enable interrupt coalescing for 83xx adapter.
* Rename IRQ description.
* Added PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_834X and PCI_DEVICE_ID_QLOGIC_824X
for the patch "qlcnic: Add identifying string for 83xx adapter" as per Francois comment.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_nat_core.c')
0 files changed, 0 insertions, 0 deletions