From 13113fcce24aee08f91e02f13a6135e3ab949e8b Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 12 Dec 2009 23:39:44 +0100
Subject: [PATCH] --- yaml --- r: 186530 b: refs/heads/master c:
 4088c7ca57b6dbe25683bb16f25233cce373996c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5d24262aede6..f85675c9bbeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da6b9ba95f2ce3f923013ce09793ab16f05bac25
+refs/heads/master: 4088c7ca57b6dbe25683bb16f25233cce373996c
diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c
index decf67fa944c..6a8d73d51357 100644
--- a/trunk/drivers/staging/batman-adv/routing.c
+++ b/trunk/drivers/staging/batman-adv/routing.c
@@ -1177,8 +1177,7 @@ static int discard_one_packet(struct batman_if *batman_if,
 {
 	int result = -EAGAIN;
 
-	if ((batman_if->if_active == IF_TO_BE_ACTIVATED)
-		&& (batman_if->raw_sock)) {
+	if (batman_if->raw_sock) {
 			result = receive_raw_packet(batman_if->raw_sock,
 						    packet_buff,
 						    PACKBUFF_SIZE);