---

yaml --- r: 186529 b: refs/heads/master c: da6b9ba h: refs/heads/master i: 186527: acb5881 v: v3
git-mirror · Mar 4, 2010 · 73f7059 · 73f7059
1 parent c9a1800
commit 73f7059
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4efe0b06559e8cb39c3d6a9bd01cc99604dfd247
+refs/heads/master: da6b9ba95f2ce3f923013ce09793ab16f05bac25
diff --git a/trunk/drivers/staging/batman-adv/routing.c b/trunk/drivers/staging/batman-adv/routing.c
@@ -1177,12 +1177,8 @@ static int discard_one_packet(struct batman_if *batman_if,
 {
 	int result = -EAGAIN;
 
-	if (batman_if->if_active != IF_TO_BE_ACTIVATED) {
-		printk(KERN_WARNING
-		       "batman-adv:Could not read from deactivated interface %s!\n",
-		       batman_if->dev);
-	} else {
-		if (batman_if->raw_sock)
+	if ((batman_if->if_active == IF_TO_BE_ACTIVATED)
+		&& (batman_if->raw_sock)) {
 			result = receive_raw_packet(batman_if->raw_sock,
 						    packet_buff,
 						    PACKBUFF_SIZE);