Skip to content

Commit c9eaaa1

Browse files
committed
Merge branch 'lan743x-Add-features-to-lan743x-driver'
Bryan Whitehead says: ==================== lan743x: Add features to lan743x driver This patch series adds extra features to the lan743x driver. Updates for v4: Patch 6/8 - Modified get/set_wol to use super set of MAC and PHY driver support. Patch 7/9 - In set_eee, return the return value from phy_ethtool_set_eee. Updates for v3: Removed patch 9 from this series, regarding PTP support Patch 6/8 - Add call to phy_ethtool_get_wol to lan743x_ethtool_get_wol Patch 7/8 - Add call to phy_ethtool_set_eee on (!eee->eee_enabled) Updates for v2: Patch 3/9 - Used ARRAY_SIZE macro in lan743x_ethtool_get_ethtool_stats. Patch 5/9 - Used MAX_EEPROM_SIZE in lan743x_ethtool_set_eeprom. Patch 6/9 - Removed unnecessary read of PMT_CTL. Used CRC algorithm from lib. Removed PHY interrupt settings from lan743x_pm_suspend Change "#if CONFIG_PM" to "#ifdef CONFIG_PM" ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 8760c4d + 43e8fe9 commit c9eaaa1

File tree

5 files changed

+1042
-4
lines changed

5 files changed

+1042
-4
lines changed

drivers/net/ethernet/microchip/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o
66
obj-$(CONFIG_ENCX24J600) += encx24j600.o encx24j600-regmap.o
77
obj-$(CONFIG_LAN743X) += lan743x.o
88

9-
lan743x-objs := lan743x_main.o
9+
lan743x-objs := lan743x_main.o lan743x_ethtool.o

0 commit comments

Comments
 (0)