diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-25 08:32:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-25 08:32:25 +0000 |
| commit | 8c41e51e92fda935eb907b9263ae44a30f9977bc (patch) | |
| tree | 4e365ae77cdc155df20d51f6b0b97fff828b3756 /target/linux/generic-2.6 | |
| parent | a99b79e9ad865990e0a6c438cfbb8adc88ccf6a0 (diff) | |
| download | upstream-8c41e51e92fda935eb907b9263ae44a30f9977bc.tar.gz upstream-8c41e51e92fda935eb907b9263ae44a30f9977bc.tar.bz2 upstream-8c41e51e92fda935eb907b9263ae44a30f9977bc.zip | |
fix failsafe on broadcom, send netlink events in diag when running linux 2.6
SVN-Revision: 7722
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/213-kobject_uevent.patch | 37 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches/213-kobject_uevent.patch | 37 |
2 files changed, 74 insertions, 0 deletions
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) |