diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 22:34:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 22:34:54 +0100 |
| commit | 58e868be77bda526cc8d4264488ed393bc607720 (patch) | |
| tree | f95692355ca78239815c1df58fe2fee7dc79d80d /net/batman-adv/originator.h | |
| parent | Merge tag 'iio-fixes-for-3.14c' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Linux 3.14-rc4 (diff) | |
| download | linux-58e868be77bda526cc8d4264488ed393bc607720.tar.xz linux-58e868be77bda526cc8d4264488ed393bc607720.zip | |
Merge 3.14-rc4 into char-misc-linus
Merge this to catch up with the other patches sent upstream.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/batman-adv/originator.h')
| -rw-r--r-- | net/batman-adv/originator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 37be290f63f6..db3a9ed734cb 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -29,6 +29,10 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr); +struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, const uint8_t *neigh_addr, struct batadv_orig_node *orig_node); |