From 73f7059a3cf24c71dd4c50e7bfcf4c5d064c6a88 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 12 Dec 2009 23:39:43 +0100
Subject: [PATCH] --- yaml --- r: 186529 b: refs/heads/master c:
 da6b9ba95f2ce3f923013ce09793ab16f05bac25 h: refs/heads/master i:   186527:
 acb5881bbcf5138e54b165f5a0f69347ef07be94 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/batman-adv/routing.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 458eb2a9b4e1..5d24262aede6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4efe0b06559e8cb39c3d6a9bd01cc99604dfd247
+refs/heads/master: da6b9ba95f2ce3f923013ce09793ab16f05bac25
diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c
index 1ff2a7aae108..decf67fa944c 100644
--- a/trunk/drivers/staging/batman-adv/routing.c
+++ b/trunk/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);