From mboxrd@z Thu Jan 1 00:00:00 1970 From: Antonio Quartulli Subject: [PATCH 03/16] batman-adv: Prefix types enum with BATADV_ Date: Mon, 2 Jul 2012 01:43:33 +0200 Message-ID: <1341186226-10549-4-git-send-email-ordex@autistici.org> References: <1341186226-10549-1-git-send-email-ordex@autistici.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Sven Eckelmann , Antonio Quartulli To: davem@davemloft.net Return-path: Received: from investici.nine.ch ([217.150.252.179]:23542 "EHLO confino.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751242Ab2GAXng (ORCPT ); Sun, 1 Jul 2012 19:43:36 -0400 In-Reply-To: <1341186226-10549-1-git-send-email-ordex@autistici.org> Sender: netdev-owner@vger.kernel.org List-ID: =46rom: Sven Eckelmann Reported-by: Martin Hundeb=C3=B8ll Signed-off-by: Sven Eckelmann Signed-off-by: Antonio Quartulli --- net/batman-adv/bat_iv_ogm.c | 8 ++++---- net/batman-adv/routing.c | 10 +++++----- net/batman-adv/soft-interface.c | 8 ++++---- net/batman-adv/translation-table.c | 8 ++++---- net/batman-adv/types.h | 28 ++++++++++++++-------------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a59e317..6099719 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -209,8 +209,8 @@ static void batadv_iv_ogm_send_to_if(struct forw_pa= cket *forw_packet, /* create clone because function is called more than once */ skb =3D skb_clone(forw_packet->skb, GFP_ATOMIC); if (skb) { - batadv_inc_counter(bat_priv, BAT_CNT_MGMT_TX); - batadv_add_counter(bat_priv, BAT_CNT_MGMT_TX_BYTES, + batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX); + batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES, skb->len + ETH_HLEN); batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); } @@ -1256,8 +1256,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *= skb, if (bat_priv->bat_algo_ops->bat_ogm_emit !=3D batadv_iv_ogm_emit) return NET_RX_DROP; =20 - batadv_inc_counter(bat_priv, BAT_CNT_MGMT_RX); - batadv_add_counter(bat_priv, BAT_CNT_MGMT_RX_BYTES, + batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX); + batadv_add_counter(bat_priv, BATADV_CNT_MGMT_RX_BYTES, skb->len + ETH_HLEN); =20 packet_len =3D skb_headlen(skb); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 4d63221..aa8325e 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -607,7 +607,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struc= t hard_iface *recv_if) =20 switch (tt_query->flags & BATADV_TT_QUERY_TYPE_MASK) { case TT_REQUEST: - batadv_inc_counter(bat_priv, BAT_CNT_TT_REQUEST_RX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_RX); =20 /* If we cannot provide an answer the tt_request is * forwarded @@ -622,7 +622,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struc= t hard_iface *recv_if) } break; case TT_RESPONSE: - batadv_inc_counter(bat_priv, BAT_CNT_TT_RESPONSE_RX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_RX); =20 if (batadv_is_my_mac(tt_query->dst)) { /* packet needs to be linearized to access the TT @@ -678,7 +678,7 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struc= t hard_iface *recv_if) if (is_broadcast_ether_addr(ethhdr->h_source)) goto out; =20 - batadv_inc_counter(bat_priv, BAT_CNT_TT_ROAM_ADV_RX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX); =20 roam_adv_packet =3D (struct roam_adv_packet *)skb->data; =20 @@ -900,8 +900,8 @@ static int batadv_route_unicast_packet(struct sk_bu= ff *skb, unicast_packet->header.ttl--; =20 /* Update stats counter */ - batadv_inc_counter(bat_priv, BAT_CNT_FORWARD); - batadv_add_counter(bat_priv, BAT_CNT_FORWARD_BYTES, + batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); + batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, skb->len + ETH_HLEN); =20 /* route it */ diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-inte= rface.c index b77e598..19a80d2 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -366,6 +366,7 @@ struct net_device *batadv_softif_create(const char = *name) struct net_device *soft_iface; struct bat_priv *bat_priv; int ret; + size_t cnt_len =3D sizeof(uint64_t) * BATADV_CNT_NUM; =20 soft_iface =3D alloc_netdev(sizeof(*bat_priv), name, batadv_interface_setup); @@ -411,8 +412,7 @@ struct net_device *batadv_softif_create(const char = *name) bat_priv->primary_if =3D NULL; bat_priv->num_ifaces =3D 0; =20 - bat_priv->bat_counters =3D __alloc_percpu(sizeof(uint64_t) * BAT_CNT_= NUM, - __alignof__(uint64_t)); + bat_priv->bat_counters =3D __alloc_percpu(cnt_len, __alignof__(uint64= _t)); if (!bat_priv->bat_counters) goto unreg_soft_iface; =20 @@ -542,14 +542,14 @@ static void batadv_get_ethtool_stats(struct net_d= evice *dev, struct bat_priv *bat_priv =3D netdev_priv(dev); int i; =20 - for (i =3D 0; i < BAT_CNT_NUM; i++) + for (i =3D 0; i < BATADV_CNT_NUM; i++) data[i] =3D batadv_sum_counter(bat_priv, i); } =20 static int batadv_get_sset_count(struct net_device *dev, int stringset= ) { if (stringset =3D=3D ETH_SS_STATS) - return BAT_CNT_NUM; + return BATADV_CNT_NUM; =20 return -EOPNOTSUPP; } diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/transl= ation-table.c index 156c309..f36d1d5 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1471,7 +1471,7 @@ static int batadv_send_tt_request(struct bat_priv= *bat_priv, dst_orig_node->orig, neigh_node->addr, (full_table ? 'F' : '.')); =20 - batadv_inc_counter(bat_priv, BAT_CNT_TT_REQUEST_TX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_TX); =20 batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr= ); ret =3D 0; @@ -1599,7 +1599,7 @@ static bool batadv_send_other_tt_response(struct = bat_priv *bat_priv, res_dst_orig_node->orig, neigh_node->addr, req_dst_orig_node->orig, req_ttvn); =20 - batadv_inc_counter(bat_priv, BAT_CNT_TT_RESPONSE_TX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX); =20 batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr= ); ret =3D true; @@ -1720,7 +1720,7 @@ static bool batadv_send_my_tt_response(struct bat= _priv *bat_priv, orig_node->orig, neigh_node->addr, (tt_response->flags & TT_FULL_TABLE ? 'F' : '.')); =20 - batadv_inc_counter(bat_priv, BAT_CNT_TT_RESPONSE_TX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX); =20 batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr= ); ret =3D true; @@ -2038,7 +2038,7 @@ static void batadv_send_roam_adv(struct bat_priv = *bat_priv, uint8_t *client, "Sending ROAMING_ADV to %pM (client %pM) via %pM\n", orig_node->orig, client, neigh_node->addr); =20 - batadv_inc_counter(bat_priv, BAT_CNT_TT_ROAM_ADV_TX); + batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_TX); =20 batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr= ); ret =3D 0; diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index fd538ea..fcbac82 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -143,20 +143,20 @@ struct bcast_duplist_entry { }; #endif =20 -enum bat_counters { - BAT_CNT_FORWARD, - BAT_CNT_FORWARD_BYTES, - BAT_CNT_MGMT_TX, - BAT_CNT_MGMT_TX_BYTES, - BAT_CNT_MGMT_RX, - BAT_CNT_MGMT_RX_BYTES, - BAT_CNT_TT_REQUEST_TX, - BAT_CNT_TT_REQUEST_RX, - BAT_CNT_TT_RESPONSE_TX, - BAT_CNT_TT_RESPONSE_RX, - BAT_CNT_TT_ROAM_ADV_TX, - BAT_CNT_TT_ROAM_ADV_RX, - BAT_CNT_NUM, +enum batadv_counters { + BATADV_CNT_FORWARD, + BATADV_CNT_FORWARD_BYTES, + BATADV_CNT_MGMT_TX, + BATADV_CNT_MGMT_TX_BYTES, + BATADV_CNT_MGMT_RX, + BATADV_CNT_MGMT_RX_BYTES, + BATADV_CNT_TT_REQUEST_TX, + BATADV_CNT_TT_REQUEST_RX, + BATADV_CNT_TT_RESPONSE_TX, + BATADV_CNT_TT_RESPONSE_RX, + BATADV_CNT_TT_ROAM_ADV_TX, + BATADV_CNT_TT_ROAM_ADV_RX, + BATADV_CNT_NUM, }; =20 struct bat_priv { --=20 1.7.9.4