* [PATCH net v2] net: dsa: add includes for ethtool and phy_fixed definitions
@ 2014-10-17 23:02 Florian Fainelli
2014-10-18 3:55 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2014-10-17 23:02 UTC (permalink / raw)
To: netdev; +Cc: davem, Florian Fainelli
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>
---
Changes in v2:
- actually include the headers instead of using forward declarations
include/net/dsa.h | 1 +
net/dsa/slave.c | 1 +
2 files changed, 2 insertions(+)
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"
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net v2] net: dsa: add includes for ethtool and phy_fixed definitions
2014-10-17 23:02 [PATCH net v2] net: dsa: add includes for ethtool and phy_fixed definitions Florian Fainelli
@ 2014-10-18 3:55 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-10-18 3:55 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Fri, 17 Oct 2014 16:02:13 -0700
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-18 3:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-17 23:02 [PATCH net v2] net: dsa: add includes for ethtool and phy_fixed definitions Florian Fainelli
2014-10-18 3:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).