X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fbroadcom-diag%2Fsrc%2Fdiag.c;h=501b835f477ceb066d06f6e3ecf83848edbe6629;hb=232ec2e0d27cf2d28abffa7b4e71198a6b40f75e;hp=620f29171cee828de1b9bd9b03d94e69bf1b412b;hpb=8681f22fad5c840d1997cb4f68401e421984e936;p=openwrt.git

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index 620f29171c..501b835f47 100644
--- 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/kobject.h>
 #include <net/sock.h>
-extern struct sock *uevent_sock;
 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	= {
-			{ .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
@@ -1047,7 +1046,7 @@ static struct platform_t __init *platform_detect(void)
 			return &platforms[WDNetCenter];
 		}
 
-		if (!strcmp(boardnum, "08") || !strcmp(boardnum, "01") &&	  
+		if ((!strcmp(boardnum, "08") || !strcmp(boardnum, "01")) &&
 				!strcmp(boardtype,"0x0472") && !strcmp(getvar("cardbus"), "1")) { /* Netgear WNR834B  V1 and V2*/
 			/* TODO: Check for version. Default platform is V2 for now. */
 			return &platforms[WNR834BV2];
@@ -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;
 
-	if (!uevent_sock)
-		return;
-
 	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;
-	netlink_broadcast(uevent_sock, event->skb, 0, 1, GFP_KERNEL);
+	broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
 
 	kfree(event);
 }