diff options
| author | David S. Miller | 2016-07-01 23:05:00 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-07-01 23:05:00 +0200 |
| commit | 3ea00443f1b17405ce9e1421bb7706777339926e (patch) | |
| tree | bc2708a8e693cc19ca8a6501c4307a3f62055d99 /net/batman-adv/send.h | |
| parent | Merge branch 'hns-next' (diff) | |
| parent | batman-adv: Add debugfs table for mcast flags (diff) | |
| download | kernel-qcow2-linux-3ea00443f1b17405ce9e1421bb7706777339926e.tar.gz kernel-qcow2-linux-3ea00443f1b17405ce9e1421bb7706777339926e.tar.xz kernel-qcow2-linux-3ea00443f1b17405ce9e1421bb7706777339926e.zip | |
Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- two patches with minimal clean up work by Antonio Quartulli and
Simon Wunderlich
- eight patches of B.A.T.M.A.N. V, API and documentation clean
up work, by Antonio Quartulli and Marek Lindner
- Andrew Lunn fixed the skb priority adoption when forwarding
fragmented packets (two patches)
- Multicast optimization support is now enabled for bridges which
comes with some protocol updates, by Linus Luessing
====================
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 6fd7270d8ce6..7cecb7563b45 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -26,8 +26,8 @@ #include "packet.h" struct sk_buff; -struct work_struct; +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); int batadv_send_skb_to_orig(struct sk_buff *skb, struct batadv_orig_node *orig_node, struct batadv_hard_iface *recv_if); @@ -38,11 +38,9 @@ int batadv_send_broadcast_skb(struct sk_buff *skb, struct batadv_hard_iface *hard_iface); int batadv_send_unicast_skb(struct sk_buff *skb, struct batadv_neigh_node *neigh_node); -void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface); int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, const struct sk_buff *skb, unsigned long delay); -void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work); void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface); |