(4/6) bcm57xx: switch-core.c/switch-robo.c check for port already registered

This patch prevents switch-robo.c from attempting robo_probe on a port
that is already registered.  robo_probe will adjust kernel reference counts
if it detects a switch on the port.  If this patch wasn't applied, the
wrt350n would hang on reboot, waiting for the network driver reference count
to reach zero indefinitely.

Signed-off-by: Ben Pfountz <netprince (at) vt (dot) edu>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11469 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 16 insertions, 0 deletions

diff --git a/package/switch/src/switch-core.c b/package/switch/src/switch-core.c
index 87aa9729cc..c34386b76f 100644
--- a/package/switch/src/switch-core.c
+++ b/package/switch/src/switch-core.c
@@ -404,6 +404,21 @@ switch_vlan_config *switch_parse_vlan(switch_driver *driver, char *buf)
 }
 
 
+int switch_device_registered (char* device) {
+	struct list_head *pos;
+	switch_driver *new;
+
+	list_for_each(pos, &drivers.list) {
+		if (strcmp(list_entry(pos, switch_driver, list)->interface, device) == 0) {
+			printk("There is already a switch registered on the device '%s'\n", device);
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+
 int switch_register_driver(switch_driver *driver)
 {
 	struct list_head *pos;
@@ -476,6 +491,7 @@ static void __exit switch_exit(void)
 MODULE_AUTHOR("Felix Fietkau <openwrt@nbd.name>");
 MODULE_LICENSE("GPL");
 
+EXPORT_SYMBOL(switch_device_registered);
 EXPORT_SYMBOL(switch_register_driver);
 EXPORT_SYMBOL(switch_unregister_driver);
 EXPORT_SYMBOL(switch_parse_vlan);