fix failsafe on broadcom, send netlink events in diag when running linux 2.6

SVN-Revision: 7722

5 files changed, 86 insertions, 23 deletions

diff --git a/target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules b/target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules
new file mode 100644
index 0000000000..098ad047a7
--- /dev/null
+++ b/target/linux/brcm-2.4/base-files/default/etc/hotplug2-init.rules
@@ -0,0 +1,12 @@
+DEVICENAME ~~ (tun|tap[0-9]) {
+	makedev /dev/net/%DEVICENAME% 0644
+	next
+}
+
+DEVPATH is set {
+	makedev /dev/%DEVICENAME% 0644
+}
+
+SUBSYSTEM ~~ button {
+	exec kill -USR1 1 ;
+}
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/140-export_uevent_handler.patch b/target/linux/brcm47xx-2.6/patches-2.6.22/140-export_uevent_handler.patch
deleted file mode 100644
index f6a41f32a2..0000000000
--- a/target/linux/brcm47xx-2.6/patches-2.6.22/140-export_uevent_handler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: linux-2.6.22-rc4/lib/kobject_uevent.c
-===================================================================
---- linux-2.6.22-rc4.orig/lib/kobject_uevent.c	2007-06-10 21:32:13.000000000 +0100
-+++ linux-2.6.22-rc4/lib/kobject_uevent.c	2007-06-10 21:33:18.000000000 +0100
-@@ -29,6 +29,7 @@
- u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
- static DEFINE_SPINLOCK(sequence_lock);
-+EXPORT_SYMBOL(uevent_helper);
- #if defined(CONFIG_NET)
- static struct sock *uevent_sock;
- #endif
diff --git a/target/linux/brcm47xx-2.6/patches/140-export_uevent_handler.patch b/target/linux/brcm47xx-2.6/patches/140-export_uevent_handler.patch
deleted file mode 100644
index 6a6f51aa7b..0000000000
--- a/target/linux/brcm47xx-2.6/patches/140-export_uevent_handler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN linux-2.6.19.ref/lib/kobject_uevent.c linux-2.6.19/lib/kobject_uevent.c
---- linux-2.6.19.ref/lib/kobject_uevent.c	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19/lib/kobject_uevent.c	2006-12-04 21:33:48.000000000 +0100
-@@ -29,6 +29,7 @@
- u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
- static DEFINE_SPINLOCK(sequence_lock);
-+EXPORT_SYMBOL(uevent_helper);
- #if defined(CONFIG_NET)
- static struct sock *uevent_sock;
- #endif
diff --git a/target/linux/generic-2.6/patches-2.6.22/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.22/213-kobject_uevent.patch
new file mode 100644
index 0000000000..62af2a182b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.22/213-kobject_uevent.patch
@@ -0,0 +1,37 @@
+--- linux-2.6.22-rc5/lib/kobject_uevent.c.old	2007-06-25 07:34:27.002266528 +0200
++++ linux-2.6.22-rc5/lib/kobject_uevent.c	2007-06-25 08:39:53.762308264 +0200
+@@ -30,9 +30,22 @@
+ char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+ static DEFINE_SPINLOCK(sequence_lock);
+ #if defined(CONFIG_NET)
+-static struct sock *uevent_sock;
++struct sock *uevent_sock = NULL;
++EXPORT_SYMBOL_GPL(uevent_sock);
+ #endif
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	spin_lock(&sequence_lock);
++	seq = ++uevent_seqnum;
++	spin_unlock(&sequence_lock);
++	
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ static char *action_to_string(enum kobject_action action)
+ {
+ 	switch (action) {
+@@ -169,9 +182,7 @@
+ 	}
+ 
+ 	/* we will send an event, request a new sequence number */
+-	spin_lock(&sequence_lock);
+-	seq = ++uevent_seqnum;
+-	spin_unlock(&sequence_lock);
++	seq = uevent_next_seqnum();
+ 	sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq);
+ 
+ #if defined(CONFIG_NET)
diff --git a/target/linux/generic-2.6/patches/213-kobject_uevent.patch b/target/linux/generic-2.6/patches/213-kobject_uevent.patch
new file mode 100644
index 0000000000..62af2a182b
--- /dev/null
+++ b/target/linux/generic-2.6/patches/213-kobject_uevent.patch
@@ -0,0 +1,37 @@
+--- linux-2.6.22-rc5/lib/kobject_uevent.c.old	2007-06-25 07:34:27.002266528 +0200
++++ linux-2.6.22-rc5/lib/kobject_uevent.c	2007-06-25 08:39:53.762308264 +0200
+@@ -30,9 +30,22 @@
+ char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
+ static DEFINE_SPINLOCK(sequence_lock);
+ #if defined(CONFIG_NET)
+-static struct sock *uevent_sock;
++struct sock *uevent_sock = NULL;
++EXPORT_SYMBOL_GPL(uevent_sock);
+ #endif
+ 
++u64 uevent_next_seqnum(void)
++{
++	u64 seq;
++
++	spin_lock(&sequence_lock);
++	seq = ++uevent_seqnum;
++	spin_unlock(&sequence_lock);
++	
++	return seq;
++}
++EXPORT_SYMBOL_GPL(uevent_next_seqnum);
++
+ static char *action_to_string(enum kobject_action action)
+ {
+ 	switch (action) {
+@@ -169,9 +182,7 @@
+ 	}
+ 
+ 	/* we will send an event, request a new sequence number */
+-	spin_lock(&sequence_lock);
+-	seq = ++uevent_seqnum;
+-	spin_unlock(&sequence_lock);
++	seq = uevent_next_seqnum();
+ 	sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq);
+ 
+ #if defined(CONFIG_NET)