aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2009-12-12 23:39:44 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:29 -0800
commit4088c7ca57b6dbe25683bb16f25233cce373996c (patch)
tree8cc8cd4a27dec5972e676eacb8761e6268e7a4c8 /drivers
parentda6b9ba95f2ce3f923013ce09793ab16f05bac25 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/batman-adv/routing.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index decf67fa944..6a8d73d5135 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);