diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-10 06:15:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-10 06:15:28 +0300 |
| commit | d401c1d1e824f8238c4da5f432151fad0945aeab (patch) | |
| tree | a7b58647e4497ebe39c7d7e7887e247defd89bf2 /net/batman-adv/send.h | |
| parent | a6dfdb4e1cd8ea0cf3e8588b97a0c33f8ad3fa4b (diff) | |
| parent | 93bbaab455f30fd43911e0881a02107a17150a62 (diff) | |
| download | linux-d401c1d1e824f8238c4da5f432151fad0945aeab.tar.xz | |
Merge tag 'batadv-next-for-davem-20161108-v2' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
pull request for net-next: batman-adv 2016-11-08 v2
This feature and cleanup patchset includes the following changes:
- netlink and code cleanups by Sven Eckelmann (3 patches)
- Cleanup and minor fixes by Linus Luessing (3 patches)
- Speed up multicast update intervals, by Linus Luessing
- Avoid (re)broadcast in meshes for some easy cases,
by Linus Luessing
- Clean up tx return state handling, by Sven Eckelmann (6 patches)
- Fix some special mac address handling cases, by Sven Eckelmann
(3 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/send.h')
| -rw-r--r-- | net/batman-adv/send.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 999f78683d9e..c58019475025 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -27,7 +27,8 @@ struct sk_buff; -void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet, + bool dropped); struct batadv_forw_packet * batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming, struct batadv_hard_iface *if_outgoing, @@ -46,7 +47,8 @@ int batadv_send_unicast_skb(struct sk_buff *skb, struct batadv_neigh_node *neigh_node); int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, const struct sk_buff *skb, - unsigned long delay); + unsigned long delay, + bool own_packet); void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface); |