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>
Showing
- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h 15 additions, 7 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic.h
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 15 additions, 4 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h 1 addition, 1 deletiondrivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c 25 additions, 0 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c 63 additions, 14 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c 158 additions, 35 deletionsdrivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Loading
Please register or sign in to comment