merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 13:14:23 +02:00
parent 20300fb745
commit 1ec632145b

View file

@ -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()