projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] uhttpd: make it work without shadow password support
[openwrt.git]
/
package
/
broadcom-diag
/
src
/
diag.c
diff --git
a/package/broadcom-diag/src/diag.c
b/package/broadcom-diag/src/diag.c
index 3a2a69bb149e11911f9d520a13442f8a94cc86ad..501b835f477ceb066d06f6e3ecf83848edbe6629 100644
(file)
--- a/
package/broadcom-diag/src/diag.c
+++ b/
package/broadcom-diag/src/diag.c
@@
-30,8
+30,8
@@
#include <linux/workqueue.h>
#include <linux/skbuff.h>
#include <linux/netlink.h>
#include <linux/workqueue.h>
#include <linux/skbuff.h>
#include <linux/netlink.h>
+#include <linux/kobject.h>
#include <net/sock.h>
#include <net/sock.h>
-extern struct sock *uevent_sock;
extern u64 uevent_next_seqnum(void);
#include "gpio.h"
extern u64 uevent_next_seqnum(void);
#include "gpio.h"
@@
-782,8
+782,7
@@
static struct platform_t __initdata platforms[] = {
[STI_NAS] = {
.name = "SimpleTech SimpleShare NAS",
.buttons = {
[STI_NAS] = {
.name = "SimpleTech SimpleShare NAS",
.buttons = {
- { .name = "reset", .gpio = 1 << 7 }, // on back, hardwired, always resets device regardless OS state
- { .name = "power", .gpio = 1 << 0 }, // on back
+ { .name = "reset", .gpio = 1 << 0 }, // Power button on back, named reset to enable failsafe.
},
.leds = {
{ .name = "diag", .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready
},
.leds = {
{ .name = "diag", .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready
@@
-1169,9
+1168,6
@@
static void hotplug_button(struct work_struct *work)
struct event_t *event = container_of(work, struct event_t, wq);
char *s;
struct event_t *event = container_of(work, struct event_t, wq);
char *s;
- if (!uevent_sock)
- return;
-
event->skb = alloc_skb(2048, GFP_KERNEL);
s = skb_put(event->skb, strlen(event->action) + 2);
event->skb = alloc_skb(2048, GFP_KERNEL);
s = skb_put(event->skb, strlen(event->action) + 2);
@@
-1179,7
+1175,7
@@
static void hotplug_button(struct work_struct *work)
fill_event(event);
NETLINK_CB(event->skb).dst_group = 1;
fill_event(event);
NETLINK_CB(event->skb).dst_group = 1;
-
netlink_broadcast(uevent_sock,
event->skb, 0, 1, GFP_KERNEL);
+
broadcast_uevent(
event->skb, 0, 1, GFP_KERNEL);
kfree(event);
}
kfree(event);
}