diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2011-11-28 08:31:55 -0500 |
|---|---|---|
| committer | Marek Lindner <lindner_marek@yahoo.de> | 2012-02-16 13:50:20 -0500 |
| commit | 01c4224b51feba2ba64d070ab9f4aa32c9d0bb29 (patch) | |
| tree | 80ca19da3b90b2b69f01492c06310be4c8678efc /net/batman-adv/routing.c | |
| parent | 1c280471b013e26c833fc86acc231c73442cfa21 (diff) | |
batman-adv: convert batman iv algorithm to use dynamic infrastructure
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 5bc41c896e35..b72d7f3b3c6a 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include "originator.h" | 29 | #include "originator.h" |
| 30 | #include "vis.h" | 30 | #include "vis.h" |
| 31 | #include "unicast.h" | 31 | #include "unicast.h" |
| 32 | #include "bat_ogm.h" | ||
| 33 | 32 | ||
| 34 | void slide_own_bcast_window(struct hard_iface *hard_iface) | 33 | void slide_own_bcast_window(struct hard_iface *hard_iface) |
| 35 | { | 34 | { |
| @@ -248,6 +247,7 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, | |||
| 248 | 247 | ||
| 249 | int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) | 248 | int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) |
| 250 | { | 249 | { |
| 250 | struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); | ||
| 251 | struct ethhdr *ethhdr; | 251 | struct ethhdr *ethhdr; |
| 252 | 252 | ||
| 253 | /* drop packet if it has not necessary minimum size */ | 253 | /* drop packet if it has not necessary minimum size */ |
| @@ -272,7 +272,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) | |||
| 272 | if (skb_linearize(skb) < 0) | 272 | if (skb_linearize(skb) < 0) |
| 273 | return NET_RX_DROP; | 273 | return NET_RX_DROP; |
| 274 | 274 | ||
| 275 | bat_ogm_receive(hard_iface, skb); | 275 | bat_priv->bat_algo_ops->bat_ogm_receive(hard_iface, skb); |
| 276 | 276 | ||
| 277 | kfree_skb(skb); | 277 | kfree_skb(skb); |
| 278 | return NET_RX_SUCCESS; | 278 | return NET_RX_SUCCESS; |