Phonet: Netlink event for autoconfigured addresses

[cascardo/linux.git] / net / phonet / pn_dev.c

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index c2b77a6..5f42f30 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -27,6 +27,8 @@
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/phonet.h>
+#include <linux/proc_fs.h>
+#include <linux/if_arp.h>
 #include <net/sock.h>
 #include <net/netns/generic.h>
 #include <net/phonet/pn_dev.h>
@@ -194,14 +196,44 @@ found:
        return err;
 }
 
+/* automatically configure a Phonet device, if supported */
+static int phonet_device_autoconf(struct net_device *dev)
+{
+       struct if_phonet_req req;
+       int ret;
+
+       if (!dev->netdev_ops->ndo_do_ioctl)
+               return -EOPNOTSUPP;
+
+       ret = dev->netdev_ops->ndo_do_ioctl(dev, (struct ifreq *)&req,
+                                               SIOCPNGAUTOCONF);
+       if (ret < 0)
+               return ret;
+
+       ASSERT_RTNL();
+       ret = phonet_address_add(dev, req.ifr_phonet_autoconf.device);
+       if (ret)
+               return ret;
+       phonet_address_notify(RTM_NEWADDR, dev,
+                               req.ifr_phonet_autoconf.device);
+       return 0;
+}
+
 /* notify Phonet of device events */
 static int phonet_device_notify(struct notifier_block *me, unsigned long what,
                                void *arg)
 {
        struct net_device *dev = arg;
 
-       if (what == NETDEV_UNREGISTER)
+       switch (what) {
+       case NETDEV_REGISTER:
+               if (dev->type == ARPHRD_PHONET)
+                       phonet_device_autoconf(dev);
+               break;
+       case NETDEV_UNREGISTER:
                phonet_device_destroy(dev);
+               break;
+       }
        return 0;
 
 }
@@ -218,6 +250,11 @@ static int phonet_init_net(struct net *net)
        if (!pnn)
                return -ENOMEM;
 
+       if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops)) {
+               kfree(pnn);
+               return -ENOMEM;
+       }
+
        INIT_LIST_HEAD(&pnn->pndevs.list);
        spin_lock_init(&pnn->pndevs.lock);
        net_assign_generic(net, phonet_net_id, pnn);
@@ -233,6 +270,8 @@ static void phonet_exit_net(struct net *net)
        for_each_netdev(net, dev)
                phonet_device_destroy(dev);
        rtnl_unlock();
+
+       proc_net_remove(net, "phonet");
        kfree(pnn);
 }