Merge tag 'metag-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[firefly-linux-kernel-4.4.55.git] / net / netfilter / xt_LED.c

diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 993de2ba89d33bb3fa532ded0952bfb83de63836..3ba31c194ccec3101aa0979bb18a693d30d1c68b 100644 (file)
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -50,11 +50,14 @@ struct xt_led_info_internal {
        struct timer_list timer;
 };
 
+#define XT_LED_BLINK_DELAY 50 /* ms */
+
 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 led_delay = XT_LED_BLINK_DELAY;
 
        /*
         * If "always blink" is enabled, and there's still some time until the
@@ -62,9 +65,10 @@ led_tg(struct sk_buff *skb, const struct xt_action_param *par)
         */
        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_blink_oneshot(&ledinternal->netfilter_led_trigger,
+                                         &led_delay, &led_delay, 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) {
@@ -133,9 +137,7 @@ static int led_tg_check(const struct xt_tgchk_param *par)
 
        err = led_trigger_register(&ledinternal->netfilter_led_trigger);
        if (err) {
-               pr_warning("led_trigger_register() failed\n");
-               if (err == -EEXIST)
-                       pr_warning("Trigger name is already in use.\n");
+               pr_err("Trigger name is already in use.\n");
                goto exit_alloc;
        }