| To: | "David S. Miller" <davem@xxxxxxxxxx> |
|---|---|
| Subject: | [PATCH] (3/5) remove X25 pre-existing device discovery loop |
| From: | Stephen Hemminger <shemminger@xxxxxxxx> |
| Date: | Tue, 13 Jan 2004 11:01:03 -0800 |
| Cc: | netdev@xxxxxxxxxxx, Henner Eisen <eis@xxxxxxxxxxxxx>, linux-x25@xxxxxxxxxxxxxxx |
| Organization: | Open Source Development Lab |
| Sender: | netdev-bounce@xxxxxxxxxxx |
Remove duplicate/conflicting code
now that netdev_register_notifier replays the device registration events.
diff -Nru a/net/x25/af_x25.c b/net/x25/af_x25.c
--- a/net/x25/af_x25.c Mon Jan 12 14:22:07 2004
+++ b/net/x25/af_x25.c Mon Jan 12 14:22:07 2004
@@ -1372,9 +1372,6 @@
static int __init x25_init(void)
{
-#ifdef MODULE
- struct net_device *dev;
-#endif /* MODULE */
sock_register(&x25_family_ops);
dev_add_pack(&x25_packet_type);
@@ -1386,23 +1383,7 @@
#ifdef CONFIG_SYSCTL
x25_register_sysctl();
#endif
-
x25_proc_init();
-#ifdef MODULE
- /*
- * Register any pre existing devices.
- */
- read_lock(&dev_base_lock);
- for (dev = dev_base; dev; dev = dev->next) {
- if ((dev->flags & IFF_UP) && (dev->type == ARPHRD_X25
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
- || dev->type == ARPHRD_ETHER
-#endif
- ))
- x25_link_device_up(dev);
- }
- read_unlock(&dev_base_lock);
-#endif /* MODULE */
return 0;
}
module_init(x25_init);
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH] (4/5) remove bpqether pre-existing device discovery loop, Stephen Hemminger |
|---|---|
| Next by Date: | [PATCH] (5/5) lapbether remove pre-existing device discovery loop, Stephen Hemminger |
| Previous by Thread: | [PATCH] (4/5) remove bpqether pre-existing device discovery loop, Stephen Hemminger |
| Next by Thread: | [PATCH] (5/5) lapbether remove pre-existing device discovery loop, Stephen Hemminger |
| Indexes: | [Date] [Thread] [Top] [All Lists] |