From patchwork Wed Dec 9 20:09:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 5186 Return-Path: Received: from londo.lunn.ch (londo.lunn.ch [80.238.139.98]) by open-mesh.net (Postfix) with ESMTP id 32B0F1543A3 for ; Wed, 9 Dec 2009 20:55:13 +0000 (UTC) Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian)) id 1NISrY-0000IN-00; Wed, 09 Dec 2009 21:10:16 +0100 From: Andrew Lunn To: gregkh@suse.de Date: Wed, 9 Dec 2009 21:09:27 +0100 Message-Id: <1260389373-1071-5-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1260389373-1071-4-git-send-email-andrew@lunn.ch> References: <1260389373-1071-1-git-send-email-andrew@lunn.ch> <1260389373-1071-2-git-send-email-andrew@lunn.ch> <1260389373-1071-3-git-send-email-andrew@lunn.ch> <1260389373-1071-4-git-send-email-andrew@lunn.ch> Sender: Andrew Lunn Cc: devel@driverdev.osuosl.org, b.a.t.m.a.n@lists.open-mesh.net Subject: [B.A.T.M.A.N.] [PATCH 04/10] staging:batman-adv:stop permanent warnings if a device is added but deactivated. X-BeenThere: b.a.t.m.a.n@lists.open-mesh.net X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2009 20:55:14 -0000 From: simon Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn 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 --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);