diff options
author | David S. Miller <davem@davemloft.net> | 2015-08-28 20:43:33 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-28 20:43:33 (GMT) |
commit | 8b72ca67fed39816b732b0cf53a1c7f2efc6400d (patch) | |
tree | 0fba964637c2a4aa7faa7dd986401098c7ff0bf0 /net/batman-adv/gateway_client.h | |
parent | 9723e6abc70a472c726d5d5ac6402a2d1bb10882 (diff) | |
parent | ed29266347025a19ee689807b07d121f0a7441f1 (diff) | |
download | linux-8b72ca67fed39816b732b0cf53a1c7f2efc6400d.tar.xz |
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/gateway_client.h')
-rw-r--r-- | net/batman-adv/gateway_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index ef4d7e3..fa95277 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -38,7 +38,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, struct batadv_tvlv_gateway_data *gateway); void batadv_gw_node_delete(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node); -void batadv_gw_node_purge(struct batadv_priv *bat_priv); +void batadv_gw_node_free(struct batadv_priv *bat_priv); int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset); bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb); enum batadv_dhcp_recipient |