The following commit has been merged in the linux branch: commit 4088c7ca57b6dbe25683bb16f25233cce373996c Author: Andrew Lunn andrew@lunn.ch Date: Sat Dec 12 23:39:44 2009 +0100
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 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);