diff options
author | Simon Wunderlich <simon@open-mesh.com> | 2013-11-13 13:14:47 -0500 |
---|---|---|
committer | Antonio Quartulli <antonio@meshcoding.com> | 2014-01-12 08:41:11 -0500 |
commit | 7351a4822d42827ba0110677c0cbad88a3d52585 (patch) | |
tree | cc3e4200c1f1ff0b27f370c451b6a36493b74d79 /net/batman-adv/icmp_socket.c | |
parent | 89652331c00f43574515059ecbf262d26d885717 (diff) |
batman-adv: split out router from orig_node
For the network wide multi interface optimization there are different
routers for each outgoing interface (outgoing from the OGM perspective,
incoming for payload traffic). To reflect this, change the router and
associated data to a list of routers.
While at it, rename batadv_orig_node_get_router() to
batadv_orig_router_get() to follow the new naming scheme.
Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
-rw-r--r-- | net/batman-adv/icmp_socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 3c08eee1b920..b384cb86f5ea 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c | |||
@@ -215,7 +215,8 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, | |||
215 | if (!orig_node) | 215 | if (!orig_node) |
216 | goto dst_unreach; | 216 | goto dst_unreach; |
217 | 217 | ||
218 | neigh_node = batadv_orig_node_get_router(orig_node); | 218 | neigh_node = batadv_orig_router_get(orig_node, |
219 | BATADV_IF_DEFAULT); | ||
219 | if (!neigh_node) | 220 | if (!neigh_node) |
220 | goto dst_unreach; | 221 | goto dst_unreach; |
221 | 222 | ||