diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-10-17 16:02:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-17 23:54:46 -0400 |
| commit | a28205437b41a2c1333c1599ce1e8f09af7b00d6 (patch) | |
| tree | 0e24b17d8670ba515af401be048a264fa2b62acd | |
| parent | 25ef1328a03c72a7285883d5b337c4b602476ecd (diff) | |
| download | linux-stable-a28205437b41a2c1333c1599ce1e8f09af7b00d6.tar.gz linux-stable-a28205437b41a2c1333c1599ce1e8f09af7b00d6.tar.bz2 linux-stable-a28205437b41a2c1333c1599ce1e8f09af7b00d6.zip | |
net: dsa: add includes for ethtool and phy_fixed definitions
net/dsa/slave.c uses functions and structures declared in phy_fixed.h
but does not explicitely include it, while dsa.h needs structure
declarations for 'struct ethtool_wolinfo' and 'struct ethtool_eee', fix
those by including the correct header files.
Fixes: ec9436baedb6 ("net: dsa: allow drivers to do link adjustment")
Fixes: ce31b31c68e7 ("net: dsa: allow updating fixed PHY link information")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/dsa.h | 1 | ||||
| -rw-r--r-- | net/dsa/slave.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 58ad8c6492db..b76559293535 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -18,6 +18,7 @@ #include <linux/of.h> #include <linux/phy.h> #include <linux/phy_fixed.h> +#include <linux/ethtool.h> enum dsa_tag_protocol { DSA_TAG_PROTO_NONE = 0, diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 8030489d9cbe..a851e9f14118 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -11,6 +11,7 @@ #include <linux/list.h> #include <linux/etherdevice.h> #include <linux/phy.h> +#include <linux/phy_fixed.h> #include <linux/of_net.h> #include <linux/of_mdio.h> #include "dsa_priv.h" |