mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 06:21:32 +02:00
8b2e13cf02
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11185 3c298f89-4303-0410-b956-a3cf2f4a3e73
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
Index: linux-2.6.21.7/lib/kobject_uevent.c
|
|
===================================================================
|
|
--- linux-2.6.21.7.orig/lib/kobject_uevent.c
|
|
+++ linux-2.6.21.7/lib/kobject_uevent.c
|
|
@@ -30,9 +30,22 @@ u64 uevent_seqnum;
|
|
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) {
|
|
@@ -171,9 +184,7 @@ int kobject_uevent_env(struct kobject *k
|
|
}
|
|
|
|
/* 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)
|