Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / net / phonet / pn_dev.c

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index ac0fae0..cde671d 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -122,8 +122,7 @@ struct net_device *phonet_device_get(struct net *net)
                        break;
                dev = NULL;
        }
-       if (dev)
-               dev_hold(dev);
+       dev_hold(dev);
        rcu_read_unlock();
        return dev;
 }
@@ -233,11 +232,11 @@ static int phonet_device_autoconf(struct net_device *dev)
        struct if_phonet_req req;
        int ret;
 
-       if (!dev->netdev_ops->ndo_do_ioctl)
+       if (!dev->netdev_ops->ndo_siocdevprivate)
                return -EOPNOTSUPP;
 
-       ret = dev->netdev_ops->ndo_do_ioctl(dev, (struct ifreq *)&req,
-                                               SIOCPNGAUTOCONF);
+       ret = dev->netdev_ops->ndo_siocdevprivate(dev, (struct ifreq *)&req,
+                                                 NULL, SIOCPNGAUTOCONF);
        if (ret < 0)
                return ret;
 
@@ -411,8 +410,7 @@ struct net_device *phonet_route_output(struct net *net, u8 daddr)
        daddr >>= 2;
        rcu_read_lock();
        dev = rcu_dereference(routes->table[daddr]);
-       if (dev)
-               dev_hold(dev);
+       dev_hold(dev);
        rcu_read_unlock();
 
        if (!dev)