aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/batman-adv
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2009-12-12 23:39:43 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:29 -0800
commitda6b9ba95f2ce3f923013ce09793ab16f05bac25 (patch)
tree8a1857fcea0ce8d3e64912974644eb80a391d81e /drivers/staging/batman-adv
parent4efe0b06559e8cb39c3d6a9bd01cc99604dfd247 (diff)
Staging: batman-adv: stop persistent warnings if a device is deactivated.
Without this change we spam the kernel log on every packet received on any other interface when an interface has been added, but is not yet active, ie UP. 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/staging/batman-adv')
-rw-r--r--drivers/staging/batman-adv/routing.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index 1ff2a7aae10..decf67fa944 100644
--- a/drivers/staging/batman-adv/routing.c
+++ b/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);