[PATCH 031/368] Staging: batman-adv: Always receive when discarding.

[Greg KH]

From: Andrew Lunn <andrew at lunn.ch>

It does not matter if the interface is to be activated or not, we must
read the packet in order that it be discarded.

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 |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

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