diff options
Diffstat (limited to 'net/batman-adv/routing.c')
-rw-r--r-- | net/batman-adv/routing.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 1aa1722d0187..db89238d6767 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c | |||
@@ -80,7 +80,6 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, | |||
80 | 80 | ||
81 | /* route added */ | 81 | /* route added */ |
82 | } else if ((!curr_router) && (neigh_node)) { | 82 | } else if ((!curr_router) && (neigh_node)) { |
83 | |||
84 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, | 83 | batadv_dbg(BATADV_DBG_ROUTES, bat_priv, |
85 | "Adding route towards: %pM (via %pM)\n", | 84 | "Adding route towards: %pM (via %pM)\n", |
86 | orig_node->orig, neigh_node->addr); | 85 | orig_node->orig, neigh_node->addr); |
@@ -172,7 +171,6 @@ void batadv_bonding_candidate_add(struct batadv_orig_node *orig_node, | |||
172 | */ | 171 | */ |
173 | hlist_for_each_entry_rcu(tmp_neigh_node, node, | 172 | hlist_for_each_entry_rcu(tmp_neigh_node, node, |
174 | &orig_node->neigh_list, list) { | 173 | &orig_node->neigh_list, list) { |
175 | |||
176 | if (tmp_neigh_node == neigh_node) | 174 | if (tmp_neigh_node == neigh_node) |
177 | continue; | 175 | continue; |
178 | 176 | ||
@@ -836,7 +834,6 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, | |||
836 | if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG && | 834 | if (unicast_packet->header.packet_type == BATADV_UNICAST_FRAG && |
837 | batadv_frag_can_reassemble(skb, | 835 | batadv_frag_can_reassemble(skb, |
838 | neigh_node->if_incoming->net_dev->mtu)) { | 836 | neigh_node->if_incoming->net_dev->mtu)) { |
839 | |||
840 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); | 837 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); |
841 | 838 | ||
842 | if (ret == NET_RX_DROP) | 839 | if (ret == NET_RX_DROP) |
@@ -1103,7 +1100,6 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb, | |||
1103 | 1100 | ||
1104 | /* packet for me */ | 1101 | /* packet for me */ |
1105 | if (batadv_is_my_mac(unicast_packet->dest)) { | 1102 | if (batadv_is_my_mac(unicast_packet->dest)) { |
1106 | |||
1107 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); | 1103 | ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb); |
1108 | 1104 | ||
1109 | if (ret == NET_RX_DROP) | 1105 | if (ret == NET_RX_DROP) |