Staging: batman-adv: Always receive when discarding.

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@hrz.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index decf67fa944cfbd8f3389fee03dacad927ca62a9..6a8d73d5135774daa0785f4bed16fb06c392ed33 100644 (file)
--- 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);