diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-29 23:14:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-29 23:42:26 +0300 |
| commit | 6bb8824732f69de0f233ae6b1a8158e149627b38 (patch) | |
| tree | 78642311a28f42df9042da41eb98652c39d51327 /drivers/net/phy/micrel.c | |
| parent | d367341b25bd5aef3bf5524baa6f73e16ceced85 (diff) | |
| parent | 2758b3e3e630ba304fc4aca434d591e70e528298 (diff) | |
| download | linux-6bb8824732f69de0f233ae6b1a8158e149627b38.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/ipv6/ip6_gre.c is a case of parallel adds.
include/trace/events/tcp.h is a little bit more tricky. The removal
of in-trace-macro ifdefs in 'net' paralleled with moving
show_tcp_state_name and friends over to include/trace/events/sock.h
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index fd500b18e77f..0f45310300f6 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -624,6 +624,7 @@ static int ksz9031_read_status(struct phy_device *phydev) phydev->link = 0; if (phydev->drv->config_intr && phy_interrupt_is_valid(phydev)) phydev->drv->config_intr(phydev); + return genphy_config_aneg(phydev); } return 0; |