Staging: batman-adv: stop persistent warnings if a device is deactivated.

Without this change we spam the kernel log on every packet received on
any other interface when an interface has been added, but is not yet
active, ie UP.

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index 1ff2a7a..decf67f 100644 (file)
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
@@ -1177,12 +1177,8 @@ static int discard_one_packet(struct batman_if *batman_if,
 {
        int result = -EAGAIN;
 
-       if (batman_if->if_active != IF_TO_BE_ACTIVATED) {
-               printk(KERN_WARNING
-                      "batman-adv:Could not read from deactivated interface %s!\n",
-                      batman_if->dev);
-       } else {
-               if (batman_if->raw_sock)
+       if ((batman_if->if_active == IF_TO_BE_ACTIVATED)
+               && (batman_if->raw_sock)) {
                        result = receive_raw_packet(batman_if->raw_sock,
                                                    packet_buff,
                                                    PACKBUFF_SIZE);