netdev
[Top] [All Lists]

[PATCH] (4/5) remove bpqether pre-existing device discovery loop

To: "David S. Miller" <davem@xxxxxxxxxx>
Subject: [PATCH] (4/5) remove bpqether pre-existing device discovery loop
From: Stephen Hemminger <shemminger@xxxxxxxx>
Date: Tue, 13 Jan 2004 11:00:39 -0800
Cc: netdev@xxxxxxxxxxx, linux-hams@xxxxxxxxxxxxxxx
Organization: Open Source Development Lab
Sender: netdev-bounce@xxxxxxxxxxx
Remove duplicate/conflicting code now that netdev_register_notifier replays the 
device registration events. Reorder initialization to avoid having to simplify 
error unwind 
if /proc creation failed.

diff -Nru a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
--- a/drivers/net/hamradio/bpqether.c   Tue Jan 13 10:23:55 2004
+++ b/drivers/net/hamradio/bpqether.c   Tue Jan 13 10:23:55 2004
@@ -606,33 +606,20 @@
  */
 static int __init bpq_init_driver(void)
 {
-       struct net_device *dev;
-
-       dev_add_pack(&bpq_packet_type);
-
-       register_netdevice_notifier(&bpq_dev_notifier);
-
-       printk(banner);
-
 #ifdef CONFIG_PROC_FS
        if (!proc_net_fops_create("bpqether", S_IRUGO, &bpq_info_fops)) {
                printk(KERN_ERR
                        "bpq: cannot create /proc/net/bpqether entry.\n");
-               unregister_netdevice_notifier(&bpq_dev_notifier);
-               dev_remove_pack(&bpq_packet_type);
                return -ENOENT;
        }
 #endif  /* CONFIG_PROC_FS */
 
-       rtnl_lock();
-       for (dev = dev_base; dev != NULL; dev = dev->next) {
-               if (dev_is_ethdev(dev) && bpq_new_device(dev)) {
-                       printk(KERN_ERR
-                              "bpq: cannot setup dev for '%s'\n",
-                              dev->name);
-               }
-       }
-       rtnl_unlock();
+       dev_add_pack(&bpq_packet_type);
+
+       register_netdevice_notifier(&bpq_dev_notifier);
+
+       printk(banner);
+
        return 0;
 }
 

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] (4/5) remove bpqether pre-existing device discovery loop, Stephen Hemminger <=