diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-08-28 13:43:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-28 13:43:33 -0700 |
| commit | 8b72ca67fed39816b732b0cf53a1c7f2efc6400d (patch) | |
| tree | 0fba964637c2a4aa7faa7dd986401098c7ff0bf0 /net/batman-adv/originator.h | |
| parent | openswitch: fix typo CONFIG_NF_CONNTRACK_LABEL (diff) | |
| parent | batman-adv: turn batadv_neigh_node_get() into local function (diff) | |
| download | linux-dev-8b72ca67fed39816b732b0cf53a1c7f2efc6400d.tar.xz linux-dev-8b72ca67fed39816b732b0cf53a1c7f2efc6400d.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- code beautification
- remove obsolete 'deleted' attribute for bat-gw node
- increase internal version number
- prevent potential access to netdev object after deregistration
- set needed_head/tail_room for batman virtual interface
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/originator.h')
| -rw-r--r-- | net/batman-adv/originator.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 3fc76f6f710c..fa18f9bf266b 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -42,12 +42,9 @@ 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 u8 *addr); struct batadv_neigh_node * -batadv_neigh_node_get(const struct batadv_orig_node *orig_node, - const struct batadv_hard_iface *hard_iface, - const u8 *addr); -struct batadv_neigh_node * -batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr, struct batadv_orig_node *orig_node); +batadv_neigh_node_new(struct batadv_orig_node *orig_node, + struct batadv_hard_iface *hard_iface, + const u8 *neigh_addr); void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node); struct batadv_neigh_node * batadv_orig_router_get(struct batadv_orig_node *orig_node, |