---

yaml --- r: 186530 b: refs/heads/master c: 4088c7c h: refs/heads/master v: v3
git-mirror · Mar 4, 2010 · 13113fc · 13113fc
1 parent 73f7059
commit 13113fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);