The following commit has been merged in the merge/master branch: commit 7b6f8f94d1134e4aeae9fa1e9b429933cc5e2bb5 Author: Antonio Quartulli ordex@autistici.org Date: Sat Mar 9 22:38:41 2013 +0100

batman-adv: add network coding Kconfig option

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 8d8afb1..7fcbe06 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -36,6 +36,20 @@ config BATMAN_ADV_DAT mesh networks. If you think that your network does not need this option you can safely remove it and save some space.

+config BATMAN_ADV_NC + bool "Network Coding" + depends on BATMAN_ADV + default n + help + 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 + 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 + can safely disable it and save some space. + config BATMAN_ADV_DEBUG bool "B.A.T.M.A.N. debugging" depends on BATMAN_ADV