|
@@ -129,7 +129,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
|
/* 802.11 specific */
|
|
|
struct wireless_dev;
|
|
|
/* 802.15.4 specific */
|
|
|
-@@ -1941,6 +1942,7 @@ struct net_device {
|
|
|
+@@ -1943,6 +1944,7 @@ struct net_device {
|
|
|
struct netprio_map __rcu *priomap;
|
|
|
#endif
|
|
|
struct phy_device *phydev;
|
|
@@ -159,7 +159,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/rtnetlink.h>
|
|
|
#include <linux/sched/signal.h>
|
|
|
-@@ -2214,6 +2215,9 @@ static int __ethtool_get_module_info(str
|
|
|
+@@ -2215,6 +2216,9 @@ static int __ethtool_get_module_info(str
|
|
|
const struct ethtool_ops *ops = dev->ethtool_ops;
|
|
|
struct phy_device *phydev = dev->phydev;
|
|
|
|
|
@@ -169,7 +169,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
|
if (phydev && phydev->drv && phydev->drv->module_info)
|
|
|
return phydev->drv->module_info(phydev, modinfo);
|
|
|
|
|
|
-@@ -2248,6 +2252,9 @@ static int __ethtool_get_module_eeprom(s
|
|
|
+@@ -2249,6 +2253,9 @@ static int __ethtool_get_module_eeprom(s
|
|
|
const struct ethtool_ops *ops = dev->ethtool_ops;
|
|
|
struct phy_device *phydev = dev->phydev;
|
|
|
|