]> git.baikalelectronics.ru Git - kernel.git/commit
net: phy: Fix modular PHYLIB build
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 27 Apr 2018 19:41:49 +0000 (12:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 28 Apr 2018 20:48:04 +0000 (16:48 -0400)
commitde38a2a50a80cd8924232d0e551913f43a69f90e
tree6d6cc7e366c09f5dec715e502f47ac86bacb9f7b
parent7d7f101bc574053e887c20b28886db9b7ebd4950
net: phy: Fix modular PHYLIB build

After commit b87f211f3e38 ("net: Move PHY statistics code into PHY
library helpers") we made net/core/ethtool.c reference symbols which are
part of the library which can be modular. David introduced a temporary
fix with b914e1c0f562 ("phy: Temporary build fix after phylib changes.")
which would prevent such modularity.

This is not desireable of course, so instead, just inline the functions
into include/linux/phy.h to keep both options available.

Fixes: b87f211f3e38 ("net: Move PHY statistics code into PHY library helpers")
Fixes: b914e1c0f562 ("phy: Temporary build fix after phylib changes.")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/Kconfig
drivers/net/phy/phy.c
include/linux/phy.h