[PATCH 030/368] Staging: batman-adv: stop persistent warnings if a device is deactivated.

[Greg KH]

From: Andrew Lunn <andrew at lunn.ch>

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 at hrz.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew at lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/batman-adv/routing.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index 1ff2a7a..decf67f 100644
--- 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);
-- 
1.7.0.1