Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

batman-adv: netifd integration, call bat_load_module before slave interface setup

Browse source 
Signed-off-by: Gui Iribarren <gui@altermundi.net>
This commit is contained in:
Gui Iribarren 2013-07-28 18:46:43 -03:00
parent 38e641e37a
commit ca73c28f1f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
batman-adv/files/lib/netifd/proto/batadv.sh
View file

@ -4,6 +4,12 @@
. ../netifd-proto.sh . ../netifd-proto.sh
init_proto "$@" init_proto "$@"
bat_load_module()
{
[ -d "/sys/module/batman_adv/" ] && return
load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv*
}
proto_batadv_init_config() { proto_batadv_init_config() {
proto_config_add_string "mesh" proto_config_add_string "mesh"
} }
@ -15,6 +21,8 @@ proto_batadv_setup() {
local mesh local mesh
json_get_vars mesh json_get_vars mesh
bat_load_module
echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface" echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface"
proto_init_update "$iface" 1 proto_init_update "$iface" 1
proto_send_update "$config" proto_send_update "$config"

6
batman-adv/files/lib/netifd/proto/batmesh.sh
View file

@ -4,12 +4,6 @@
. ../netifd-proto.sh . ../netifd-proto.sh
init_proto "$@" init_proto "$@"
bat_load_module()
{
[ -d "/sys/module/batman_adv/" ] && return
load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv*
}
proto_batmesh_init_config() { proto_batmesh_init_config() {
proto_config_add_string "aggregated_ogms" proto_config_add_string "aggregated_ogms"
proto_config_add_string "ap_isolation" proto_config_add_string "ap_isolation"