diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-14 11:47:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-14 11:47:15 -0400 |
| commit | 1e32b0c65c9e3f1a09cb5d1bcc0c5becf849d85f (patch) | |
| tree | 3d7d1ab9a4ddfc442f2e56e887671ba8e24a0a7e /net/batman-adv/main.c | |
| parent | 7cc163806b0dc31ea2067d48a2732b452a709f48 (diff) | |
| parent | 2df5278b0267c799f3e877e8eeddbb6e93cda0bb (diff) | |
| download | op-kernel-dev-1e32b0c65c9e3f1a09cb5d1bcc0c5becf849d85f.zip op-kernel-dev-1e32b0c65c9e3f1a09cb5d1bcc0c5becf849d85f.tar.gz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- introduction of the new Network Coding component. This new mechanism aims to
increase throughput by fusing multiple packets in one transmission.
- minor cleanups
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 0488d70..0495a7d 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -35,6 +35,7 @@ #include "vis.h" #include "hash.h" #include "bat_algo.h" +#include "network-coding.h" /* List manipulations on hardif_list have to be rtnl_lock()'ed, @@ -135,6 +136,10 @@ int batadv_mesh_init(struct net_device *soft_iface) if (ret < 0) goto err; + ret = batadv_nc_init(bat_priv); + if (ret < 0) + goto err; + atomic_set(&bat_priv->gw.reselect, 0); atomic_set(&bat_priv->mesh_state, BATADV_MESH_ACTIVE); @@ -157,6 +162,7 @@ void batadv_mesh_free(struct net_device *soft_iface) batadv_gw_node_purge(bat_priv); batadv_originator_free(bat_priv); + batadv_nc_free(bat_priv); batadv_tt_free(bat_priv); |
