diff mbox

[04/10] staging:batman-adv:stop permanent warnings if a device is added but deactivated.

Message ID 1260389373-1071-5-git-send-email-andrew@lunn.ch
State Accepted, archived
Commit 0da533406524a39c40b8326ebdb9935399c50c93
Headers show

Commit Message

Andrew Lunn Dec. 9, 2009, 8:09 p.m. UTC
From: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c>

Signed-off-by: Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1487 45894c77-fb22-0410-b583-ff6e7d5dbf6c
---
 routing.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/routing.c b/routing.c
index 1ff2a7a..26320d5 100644
--- a/routing.c
+++ b/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);