diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-20 12:59:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-20 12:59:37 -0700 |
| commit | eac56465b88cc9ad3b964a9f0a02be3d3a136ddf (patch) | |
| tree | 63550c9f343f6c9351f0b54be8664807e97abb93 /net/batman-adv/routing.h | |
| parent | 1b9c4134c126aa8ae00a57672d4a4eaecc436b54 (diff) | |
| parent | 43676ab590c3f8686fd047d34c3e33803eef71f0 (diff) | |
| download | linux-rt-eac56465b88cc9ad3b964a9f0a02be3d3a136ddf.tar.gz | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/routing.h')
| -rw-r--r-- | net/batman-adv/routing.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 0ce03923ec05..fb14e9579b19 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -25,11 +25,10 @@ void slide_own_bcast_window(struct hard_iface *hard_iface); void receive_bat_packet(const struct ethhdr *ethhdr, struct batman_packet *batman_packet, - const unsigned char *tt_buff, int tt_buff_len, + const unsigned char *tt_buff, struct hard_iface *if_incoming); void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, - struct neigh_node *neigh_node, const unsigned char *tt_buff, - int tt_buff_len); + struct neigh_node *neigh_node); int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); @@ -37,6 +36,8 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_bat_packet(struct sk_buff *skb, struct hard_iface *recv_if); +int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if); +int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if); struct neigh_node *find_router(struct bat_priv *bat_priv, struct orig_node *orig_node, const struct hard_iface *recv_if); |