diff options
author | David S. Miller <davem@davemloft.net> | 2013-10-03 15:57:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-03 15:57:36 -0400 |
commit | 196896d4bb297e3ff24e62b2bfc22bbed7a28431 (patch) | |
tree | 4c8495abbcf9b6f769046a9b78df8588bf07504f /net/batman-adv/main.c | |
parent | 569943d0639c85a451ea853087cbd5f738247dd9 (diff) | |
parent | 6c519bad7b19a2c14a075b400edabaa630330123 (diff) | |
download | linux-196896d4bb297e3ff24e62b2bfc22bbed7a28431.tar.gz linux-196896d4bb297e3ff24e62b2bfc22bbed7a28431.tar.bz2 linux-196896d4bb297e3ff24e62b2bfc22bbed7a28431.zip |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Included change:
- fix multi soft-interfaces setups with Network Coding enabled by
registering the CODED packet type once only (instead of once per soft-if)
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/main.c')
-rw-r--r-- | net/batman-adv/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index c72d1bcdcf49..1356af660b5b 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -65,6 +65,7 @@ static int __init batadv_init(void) batadv_recv_handler_init(); batadv_iv_init(); + batadv_nc_init(); batadv_event_workqueue = create_singlethread_workqueue("bat_events"); @@ -142,7 +143,7 @@ int batadv_mesh_init(struct net_device *soft_iface) if (ret < 0) goto err; - ret = batadv_nc_init(bat_priv); + ret = batadv_nc_mesh_init(bat_priv); if (ret < 0) goto err; @@ -167,7 +168,7 @@ void batadv_mesh_free(struct net_device *soft_iface) batadv_vis_quit(bat_priv); batadv_gw_node_purge(bat_priv); - batadv_nc_free(bat_priv); + batadv_nc_mesh_free(bat_priv); batadv_dat_free(bat_priv); batadv_bla_free(bat_priv); |