From 1ec632145bcc70954701e2c0663722023d165a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?=
 <benedikt.krueger@rwth-aachen.de>
Date: Tue, 2 Aug 2011 13:14:23 +0200
Subject: [PATCH] merge  && test for master

---
 drivers/net/mmnif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mmnif.c b/drivers/net/mmnif.c
index cf818bf0..f8b2afbf 100644
--- a/drivers/net/mmnif.c
+++ b/drivers/net/mmnif.c
@@ -849,7 +849,7 @@ drop_packet_fast:
 
 	mmnif->stats.tx_err++;
 
-	return ERR_IF;
+        return ERR_OK;
 }
 
 /* mmnif_link_layer(): wrapper function called by ip_output()