Staging: batman-adv: stop persistent warnings if a device is deactivated.
authorAndrew Lunn <andrew@lunn.ch>
Sat, 12 Dec 2009 22:39:43 +0000 (23:39 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:29 +0000 (16:42 -0800)
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>
drivers/staging/batman-adv/routing.c

index 1ff2a7aae108a195f4f8b6b7f03b77809872e13b..decf67fa944cfbd8f3389fee03dacad927ca62a9 100644 (file)
@@ -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);