diff options
| author | Marek Lindner | 2012-03-04 09:56:25 +0100 |
|---|---|---|
| committer | Antonio Quartulli | 2012-05-11 10:08:11 +0200 |
| commit | c3e29312c8c27d403f91522711ce9a290c7571c9 (patch) | |
| tree | a366ebef6e2d65ed5fdbec48e38fc3e630a9e367 /net/batman-adv/main.c | |
| parent | batman-adv: introduce packet type handler array for incoming packets (diff) | |
| download | kernel-qcow2-linux-c3e29312c8c27d403f91522711ce9a290c7571c9.tar.gz kernel-qcow2-linux-c3e29312c8c27d403f91522711ce9a290c7571c9.tar.xz kernel-qcow2-linux-c3e29312c8c27d403f91522711ce9a290c7571c9.zip | |
batman-adv: register batman ogm receive function during protocol init
The B.A.T.M.A.N. IV OGM receive function still was hard-coded although
it is a routing protocol specific function. This patch takes advantage
of the dynamic packet handler registration to remove the hard-coded
function calls.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net/batman-adv/main.c')
| -rw-r--r-- | net/batman-adv/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index d19b93575d56..f80c4474127c 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -266,8 +266,6 @@ static void recv_handler_init(void) for (i = 0; i < ARRAY_SIZE(recv_packet_handler); i++) recv_packet_handler[i] = recv_unhandled_packet; - /* batman originator packet */ - recv_packet_handler[BAT_IV_OGM] = recv_bat_ogm_packet; /* batman icmp packet */ recv_packet_handler[BAT_ICMP] = recv_icmp_packet; /* unicast packet */ @@ -334,8 +332,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) !bat_algo_ops->bat_primary_iface_set || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || - !bat_algo_ops->bat_ogm_emit || - !bat_algo_ops->bat_ogm_receive) { + !bat_algo_ops->bat_ogm_emit) { pr_info("Routing algo '%s' does not implement required ops\n", bat_algo_ops->name); goto out; |