The following commit has been merged in the merge/master branch: commit ce223eebdbb456784e5f95eb80583e22833e1ef2 Author: Antonio Quartulli ordex@autistici.org Date: Wed May 29 02:33:18 2013 +0200

batman-adv: fix merge conflict

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index dcfae83..2f0bd3f 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -850,12 +850,6 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, ret = NET_RX_SUCCESS; }

- /* Update stats counter */ - batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); - batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, - skb->len + ETH_HLEN); - } - out: if (neigh_node) batadv_neigh_node_free_ref(neigh_node);