Add bmx6-table plugin for bmx6 in Makefile
Merge branch 'master' into bmx6_testing
bmx6: update to current master revision
nodogsplash: check if TrafficControl is enabled before testing imq module requirement.

This avoids failing to start in current OpenWrt Attitude Adjustment and trunk,
which lack IMQ support (and WONTFIX). Suggested in the issue discussed in:
http://ml.ninux.org/pipermail/nodogsplash/2013-May/000009.html

Signed-off-by: Gui Iribarren <gui@altermundi.net>
nodogsplash: recognize yes, true or 1 as valid TrafficControl values
alfred: fix batadv-vis invocation in init.d script

broken (wouldn't start, failing silently) since the following commit:
 * "renamed vis to batadv-vis to avoid collisions with other vis binaries"
which renamed only some instances of the "vis" command

Signed-off-by: Gui Iribarren <gui@altermundi.net>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
alfred: workaround race condition when batmanif is not ready at boot time

Wait up to 30 seconds during init.d script on boot, so that batmanif can
come up. If the timeout is reached, the init.d script refuses to start
alfred and related daemons.

This prevents an alfred crash when it would start during early boot, before
batmanif is available. Instead, alfred is started as soon as batmanif appears,
if that happens during the 30-second window.

Signed-off-by: Gui Iribarren <gui@altermundi.net>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Merge pull request #12 from openwrt-routing/nds-optional-imq

nodogsplash: check if TrafficControl is enabled before testing imq module requirement.
olsrd: hotplug: optimize execution-speed and simplify using already existing GLOBAL vars instead of encapsulating vars from function to function, cleanups and comments in source
olsrd: hotplug: changed a varname which broke in 3a1fd118833e8c6d341fde4ef99d31786c3614c9
luci-app-bmx6: Initialize tun6in6 variable and add further checks

Signed-off-by: Pau Escrich <p4u@dabax.net>
Merge branch 'master' into bmx6_testing
[bird] Update to 1.4.0 and move bird6 to Routing and Redirection.
batman-adv: upgrade package to latest release 2014.0.0

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
alfred: bump version to 2014.0.0

bump alfred to version 2014.0.0. From the CHANGELOG:

 * add installation of the alfred-gpsd manpage
 * add -lm to linker flags for libgps in alfred-gpsd

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
batman-adv: fix batman-adv header overhead calculation

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
batman-adv: add 'crc16' dependency which is still needed but got removed accidentally

The 'crc16' kernel lib is still needed/used by the BLA framework
(Bridge Loop Avoidance) in bridge_loop_avoidance.c. Thanks to
Antonio 'ordex' Quartulli for confirmation.

Introduced by 1ee5b17e4f7b2c145524edfb51617c911fad7cc4
("upgrade package to latest release 2014.0.0").

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Merge pull request #14 from Noltari/bird-1.4.0

[bird] Update to 1.4.0 and move bird6 to Routing and Redirection.
[bird] Cleanup unneeded files.
[bird] Improve init files.