diff options
author | David S. Miller <davem@davemloft.net> | 2011-09-21 15:25:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-21 15:25:47 -0400 |
commit | 0c070900f64ef37daf198eea5ef778eb8dba5020 (patch) | |
tree | b31a54fff10f28333daeca0d86d74bb3201110e6 /net/batman-adv/send.h | |
parent | f26cd41ae56f3c0ef4521505ad5b6e3940849c33 (diff) | |
parent | 320f422f629c7ed5d07b4186aa491d1e11d18a4c (diff) | |
download | lwn-0c070900f64ef37daf198eea5ef778eb8dba5020.tar.gz lwn-0c070900f64ef37daf198eea5ef778eb8dba5020.zip |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/send.h')
-rw-r--r-- | net/batman-adv/send.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 1f2d1e877663..c8ca3ef7385b 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -24,15 +24,10 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface, const uint8_t *dst_addr); -void schedule_own_packet(struct hard_iface *hard_iface); -void schedule_forward_packet(struct orig_node *orig_node, - const struct ethhdr *ethhdr, - struct batman_packet *batman_packet, - int directlink, - struct hard_iface *if_outgoing); +void schedule_bat_ogm(struct hard_iface *hard_iface); int add_bcast_packet_to_list(struct bat_priv *bat_priv, const struct sk_buff *skb, unsigned long delay); -void send_outstanding_bat_packet(struct work_struct *work); +void send_outstanding_bat_ogm_packet(struct work_struct *work); void purge_outstanding_packets(struct bat_priv *bat_priv, const struct hard_iface *hard_iface); |