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 | c20906011668315d50d629cb2d4dc46de9062d9a (patch) | |
tree | 1db4163deba31f36d771177dfcfabb21cd93f2ac /package/broadcom-diag/src/diag.h | |
parent | 21e832921cd728a2e039b1e4c3948a78a54f8938 (diff) | |
download | upstream-c20906011668315d50d629cb2d4dc46de9062d9a.tar.gz upstream-c20906011668315d50d629cb2d4dc46de9062d9a.tar.bz2 upstream-c20906011668315d50d629cb2d4dc46de9062d9a.zip |
fix failsafe on broadcom, send netlink events in diag when running linux 2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7722 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-diag/src/diag.h')
-rw-r--r-- | package/broadcom-diag/src/diag.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/package/broadcom-diag/src/diag.h b/package/broadcom-diag/src/diag.h index 9b6dc36336..93fdedb85c 100644 --- a/package/broadcom-diag/src/diag.h +++ b/package/broadcom-diag/src/diag.h @@ -74,9 +74,16 @@ struct platform_t { struct event_t { struct work_struct wq; - char buf[256]; - char *argv[3]; - char *envp[6]; + unsigned long seen; + char *name, *action; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) + struct sk_buff *skb; +#else + char *scratch; + char *argv[4]; + char *envp[7]; + u8 enr, anr; +#endif }; extern char *nvram_get(char *str); @@ -88,12 +95,13 @@ static struct platform_t platform; static void register_buttons(struct button_t *b); static void unregister_buttons(struct button_t *b); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) +#ifndef LINUX_2_4 static void hotplug_button(struct work_struct *work); +static irqreturn_t button_handler(int irq, void *dev_id); #else static void hotplug_button(struct event_t *event); -#endif static irqreturn_t button_handler(int irq, void *dev_id, struct pt_regs *regs); +#endif /* leds */ |