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

From: Stephen Hemminger (boea.ftcrhkqyzb@rele.tunk.net)
Date: Tue Jan 13 2004 - 21:00:39 EET

  • Next message: Bk-commits-head: "Modern way of losing layman we;ght natural variously"

    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;
     }
     
    -
    To unsubscribe from this list: send the line "unsubscribe linux-hams" in
    the body of a message to tnaxfkzw.dzggexj@clarins.net
    More majordomo info at http://vger.kernel.org/majordomo-info.html

    This archive was generated by hypermail 2b30 : Tue Jan 13 2004 - 21:04:09 EET