Commit 3369afba authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: Call into DSA netdevice_ops wrappers

Make the core net_device code call into our ndo_do_ioctl() and
ndo_get_phys_port_name() functions via the wrappers defined previously
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cfab356
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
#include <net/busy_poll.h> #include <net/busy_poll.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/stat.h> #include <linux/stat.h>
#include <net/dsa.h>
#include <net/dst.h> #include <net/dst.h>
#include <net/dst_metadata.h> #include <net/dst_metadata.h>
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
...@@ -8602,6 +8603,10 @@ int dev_get_phys_port_name(struct net_device *dev, ...@@ -8602,6 +8603,10 @@ int dev_get_phys_port_name(struct net_device *dev,
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
int err; int err;
err = dsa_ndo_get_phys_port_name(dev, name, len);
if (err == 0 || err != -EOPNOTSUPP)
return err;
if (ops->ndo_get_phys_port_name) { if (ops->ndo_get_phys_port_name) {
err = ops->ndo_get_phys_port_name(dev, name, len); err = ops->ndo_get_phys_port_name(dev, name, len);
if (err != -EOPNOTSUPP) if (err != -EOPNOTSUPP)
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/net_tstamp.h> #include <linux/net_tstamp.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <net/dsa.h>
#include <net/wext.h> #include <net/wext.h>
/* /*
...@@ -231,6 +232,10 @@ static int dev_do_ioctl(struct net_device *dev, ...@@ -231,6 +232,10 @@ static int dev_do_ioctl(struct net_device *dev,
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
err = dsa_ndo_do_ioctl(dev, ifr, cmd);
if (err == 0 || err != -EOPNOTSUPP)
return err;
if (ops->ndo_do_ioctl) { if (ops->ndo_do_ioctl) {
if (netif_device_present(dev)) if (netif_device_present(dev))
err = ops->ndo_do_ioctl(dev, ifr, cmd); err = ops->ndo_do_ioctl(dev, ifr, cmd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment