diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-07 00:37:13 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-07 00:37:13 -0800 |
commit | b8cec4a415e807a2f8679efa89558a040a7003de (patch) | |
tree | 1a5fc7c31c4f8b55ea850599bb7309871165f48e /net/batman-adv/send.h | |
parent | 5e2b61f78411be25f0b84f97d5b5d312f184dfd1 (diff) | |
parent | e44d8fe2b5c27ecc230f886d4cc49fcbd86f87a0 (diff) | |
download | kernel_samsung_espresso10-b8cec4a415e807a2f8679efa89558a040a7003de.zip kernel_samsung_espresso10-b8cec4a415e807a2f8679efa89558a040a7003de.tar.gz kernel_samsung_espresso10-b8cec4a415e807a2f8679efa89558a040a7003de.tar.bz2 |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/send.h')
-rw-r--r-- | net/batman-adv/send.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index b68c272..7b2ff19 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -23,17 +23,17 @@ #define _NET_BATMAN_ADV_SEND_H_ int send_skb_packet(struct sk_buff *skb, - struct batman_if *batman_if, + struct hard_iface *hard_iface, uint8_t *dst_addr); -void schedule_own_packet(struct batman_if *batman_if); +void schedule_own_packet(struct hard_iface *hard_iface); void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, int hna_buff_len, - struct batman_if *if_outgoing); + struct hard_iface *if_outgoing); int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb); void send_outstanding_bat_packet(struct work_struct *work); void purge_outstanding_packets(struct bat_priv *bat_priv, - struct batman_if *batman_if); + struct hard_iface *hard_iface); #endif /* _NET_BATMAN_ADV_SEND_H_ */ |