The following commit has been merged in the merge/master branch: commit 76b7062984256240ed73f97ef1b8fcc8dcd1c7a8 Author: Antonio Quartulli ordex@autistici.org Date: Wed Mar 13 21:39:06 2013 +0100
batman-adv: fix Makefile
Signed-off-by: Antonio Quartulli ordex@autistici.org
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 7fcbe06..fa780b7 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -44,7 +44,7 @@ config BATMAN_ADV_NC This option enables network coding, a mechanism that aims to increase the overall network throughput by fusing multiple packets in one transmission. - Note that interface controlled by batman-adv must be manually + Note that interfaces controlled by batman-adv must be manually configured to have promiscuous mode enabled in order to make network coding work. If you think that your network does not need this feature you