diff options
author | Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 2010-12-29 11:15:19 -0500 |
---|---|---|
committer | Sven Eckelmann <sven@narfation.org> | 2011-01-31 08:57:09 -0500 |
commit | 74ef115359f5beb565baddfb250f264d9177c108 (patch) | |
tree | aec2314d58563f49438aee5eeeb94531d1815c15 /net/batman-adv/routing.c | |
parent | ae361ce19fa135035c6b83ac1f07090b72fd4b8f (diff) |
batman-adv: remove unused parameters
Some function parameters are obsolete now and can be removed.
Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/routing.c')
-rw-r--r-- | net/batman-adv/routing.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index a8cd3897b7d0..e946dc93b9bd 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -433,8 +433,7 @@ static char count_real_packets(struct ethhdr *ethhdr, | |||
433 | } | 433 | } |
434 | 434 | ||
435 | /* copy primary address for bonding */ | 435 | /* copy primary address for bonding */ |
436 | static void mark_bonding_address(struct bat_priv *bat_priv, | 436 | static void mark_bonding_address(struct orig_node *orig_node, |
437 | struct orig_node *orig_node, | ||
438 | struct orig_node *orig_neigh_node, | 437 | struct orig_node *orig_neigh_node, |
439 | struct batman_packet *batman_packet) | 438 | struct batman_packet *batman_packet) |
440 | 439 | ||
@@ -447,8 +446,7 @@ static void mark_bonding_address(struct bat_priv *bat_priv, | |||
447 | } | 446 | } |
448 | 447 | ||
449 | /* mark possible bond.candidates in the neighbor list */ | 448 | /* mark possible bond.candidates in the neighbor list */ |
450 | void update_bonding_candidates(struct bat_priv *bat_priv, | 449 | void update_bonding_candidates(struct orig_node *orig_node) |
451 | struct orig_node *orig_node) | ||
452 | { | 450 | { |
453 | int candidates; | 451 | int candidates; |
454 | int interference_candidate; | 452 | int interference_candidate; |
@@ -730,9 +728,8 @@ void receive_bat_packet(struct ethhdr *ethhdr, | |||
730 | update_orig(bat_priv, orig_node, ethhdr, batman_packet, | 728 | update_orig(bat_priv, orig_node, ethhdr, batman_packet, |
731 | if_incoming, hna_buff, hna_buff_len, is_duplicate); | 729 | if_incoming, hna_buff, hna_buff_len, is_duplicate); |
732 | 730 | ||
733 | mark_bonding_address(bat_priv, orig_node, | 731 | mark_bonding_address(orig_node, orig_neigh_node, batman_packet); |
734 | orig_neigh_node, batman_packet); | 732 | update_bonding_candidates(orig_node); |
735 | update_bonding_candidates(bat_priv, orig_node); | ||
736 | 733 | ||
737 | /* is single hop (direct) neighbor */ | 734 | /* is single hop (direct) neighbor */ |
738 | if (is_single_hop_neigh) { | 735 | if (is_single_hop_neigh) { |
@@ -866,7 +863,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, | |||
866 | } | 863 | } |
867 | 864 | ||
868 | static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, | 865 | static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv, |
869 | struct sk_buff *skb, size_t icmp_len) | 866 | struct sk_buff *skb) |
870 | { | 867 | { |
871 | struct orig_node *orig_node; | 868 | struct orig_node *orig_node; |
872 | struct icmp_packet *icmp_packet; | 869 | struct icmp_packet *icmp_packet; |
@@ -978,7 +975,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) | |||
978 | 975 | ||
979 | /* TTL exceeded */ | 976 | /* TTL exceeded */ |
980 | if (icmp_packet->ttl < 2) | 977 | if (icmp_packet->ttl < 2) |
981 | return recv_icmp_ttl_exceeded(bat_priv, skb, hdr_size); | 978 | return recv_icmp_ttl_exceeded(bat_priv, skb); |
982 | 979 | ||
983 | ret = NET_RX_DROP; | 980 | ret = NET_RX_DROP; |
984 | 981 | ||