aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of/of_mdio.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-05-28 12:40:13 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-28 12:40:13 -0400
commit6623b4194459c07859d3e3196c3994fa7be5b88e (patch)
treebebaa38a52d418d8dae7ec8055c2a98b08406046 /drivers/of/of_mdio.c
parentMerge branch 'net-sysfs-docs' (diff)
parenti40evf: Use is_multicast_ether_addr helper (diff)
downloadlinux-dev-6623b4194459c07859d3e3196c3994fa7be5b88e.tar.xz
linux-dev-6623b4194459c07859d3e3196c3994fa7be5b88e.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to e1000, e1000e, ixgbe and i40evf. Emil provides a fix for ixgbe so that non-fiber devices with MNG FW enabled are able to link at 100Mbps. Jacob provides several changes for ixgbe, most of which are PTP related. Renames ixgbe_ptp_enable() to ixgbe_ptp_feature_enable() to better reflect the functions purpose. Extracts the hardware setup logic for the PTP hardware bits from the ixgbe_ptp_set_ts_config() to enable future work for the ixgbe_ptp_reset(). Maintain the hwstamp configuration through a reset and extracts the creation of the PTP clock device from ptp_init() in order to properly handle a suspend/resume cycle and only calls it if we don't already have a ptp_clock pointer. David provides a patch to expend the e1000e driver to turn on unicast PROMISC when there is failure to write to a shared receive address register. The fix update_phy_task() for 82579 is expanded to include newer PHYs as well so that the dev_spec->eee_lp_ability has the correct value when going into SX states. Todd provides a e1000e fix an errata for 82574/82583 where it is possible bad bits are read from SYSTIMH/L so check to see that the time is incrementing at a reasonable rate and is a multiple of the time incremental value. Removes a redundant igb PHY power down register write. Andi Kleen out of lines two write functions for e1000e to save 30k text size. Tobias Klauser converts the e1000 and i40evf drivers to use the is_broadcast_ether_addr() and is_multicast_ether_addr(). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions