From: "Jiří Prchal" <jiri.prchal@aksignal.cz>
To: coreteam@netfilter.org, netfilter@vger.kernel.org,
netfilter-devel@vger.kernel.org, kadlec@blackhole.kfki.hu,
kaber@trash.net, pablo@netfilter.org
Subject: [BUG] nf: xt_LED: led-always-blink invisible
Date: Thu, 19 Jun 2014 11:17:49 +0200 [thread overview]
Message-ID: <53A2AABD.8000109@aksignal.cz> (raw)
Hi all,
probably I found bug in kernel 3.14.0 in xt_LED module when set led-always-blink. If it is set, then between switch led
OFF and ON is almost zero time. So blink is invisible. I did some fix, but I'm not sure if this way would be good.
Please, help to direct me. This is not final patch so don't punish me for coding style.
diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 993de2b..430584b 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -54,30 +54,32 @@ static unsigned int
led_tg(struct sk_buff *skb, const struct xt_action_param *par)
{
const struct xt_led_info *ledinfo = par->targinfo;
struct xt_led_info_internal *ledinternal = ledinfo->internal_data;
+ unsigned long t=50;
/*
* If "always blink" is enabled, and there's still some time until the
* LED will switch off, briefly switch it off now.
*/
if ((ledinfo->delay > 0) && ledinfo->always_blink &&
timer_pending(&ledinternal->timer))
- led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
-
- led_trigger_event(&ledinternal->netfilter_led_trigger, LED_FULL);
+ //led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
+ led_trigger_blink_oneshot(&ledinternal->netfilter_led_trigger, &t, &t, 1);
+ else
+ led_trigger_event(&ledinternal->netfilter_led_trigger, LED_FULL);
/* If there's a positive delay, start/update the timer */
if (ledinfo->delay > 0) {
mod_timer(&ledinternal->timer,
jiffies + msecs_to_jiffies(ledinfo->delay));
/* Otherwise if there was no delay given, blink as fast as possible */
} else if (ledinfo->delay == 0) {
led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
}
/* else the delay is negative, which means switch on and stay on */
return XT_CONTINUE;
}
next reply other threads:[~2014-06-19 9:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-19 9:17 Jiří Prchal [this message]
2014-06-30 10:54 ` [BUG] nf: xt_LED: led-always-blink invisible Pablo Neira Ayuso
2014-06-30 23:36 ` Bryan Wu
2014-07-25 7:21 ` [PATCH] nf: xt_LED: fix too short led-always-blink Jiří Prchal
2014-07-25 12:22 ` Pablo Neira Ayuso
2014-07-25 12:40 ` [PATCH v2] " Jiří Prchal
2014-07-25 12:59 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53A2AABD.8000109@aksignal.cz \
--to=jiri.prchal@aksignal.cz \
--cc=coreteam@netfilter.org \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=netfilter-devel@vger.kernel.org \
--cc=netfilter@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).