diff mbox

[5/7] batman-adv: changed debug messages for easier bla debugging

Message ID 1456381821-29796-1-git-send-email-apape@phoenixcontact.com (mailing list archive)
State Superseded, archived
Delegated to: Marek Lindner
Headers

Commit Message

Andreas Pape Feb. 25, 2016, 6:30 a.m. UTC 
  Some of the bla debug messages are changed and additional messages are
added for easier bla debugging. Some debug messages introduced with
the dat changes in prior patches have been changed to be more compliant
to other existing debug messages.

Signed-off-by: Andreas Pape <apape@phoenixcontact.com>
---
 net/batman-adv/bridge_loop_avoidance.c |   19 +++++++++++++------
 net/batman-adv/routing.c               |    3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

--
1.7.0.4



..................................................................
PHOENIX CONTACT ELECTRONICS GmbH

Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont
USt-Id-Nr.: DE811742156
Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528
Geschäftsführer / Executive Board: Roland Bent, Dr. Martin Heubeck
diff mbox

Patch

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 6c29ec2..9e53fba 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -675,8 +675,8 @@  static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
 			goto claim_free_ref;

 		batadv_dbg(BATADV_DBG_BLA, bat_priv,
-			   "bla_add_claim(): changing ownership for %pM, vid %d\n",
-			   mac, BATADV_PRINT_VID(vid));
+			   "bla_add_claim(): changing ownership for %pM, vid %d to gw %pM\n",
+			   mac, BATADV_PRINT_VID(vid), backbone_gw->orig);

 		spin_lock_bh(&claim->backbone_gw->crc_lock);
 		claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
@@ -1196,10 +1196,13 @@  static void batadv_bla_purge_claims(struct batadv_priv *bat_priv,
 				continue;

 			batadv_dbg(BATADV_DBG_BLA, bat_priv,
-				   "bla_purge_claims(): %pM, vid %d, time out\n",
-				   claim->addr, claim->vid);
+					"bla_purge_claims(): timed out.\n");

 purge_now:
+			batadv_dbg(BATADV_DBG_BLA, bat_priv,
+					"bla_purge_claims(): %pM, vid %d\n",
+					claim->addr, claim->vid);
+
 			batadv_handle_unclaim(bat_priv, primary_if,
 					      claim->backbone_gw->orig,
 					      claim->addr, claim->vid);
@@ -1647,9 +1650,13 @@  int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
 		/* possible optimization: race for a claim */
 		/* No claim exists yet, claim it for us!
 		 */
+
+		batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_rx(): Unclaimed MAC %pM found. "
+			"Claim it. Local: %s\n",
+			ethhdr->h_source, batadv_is_my_client(bat_priv, ethhdr->h_source, vid) ? "yes" : "no");
 		batadv_handle_claim(bat_priv, primary_if,
-				    primary_if->net_dev->dev_addr,
-				    ethhdr->h_source, vid);
+				primary_if->net_dev->dev_addr,
+				ethhdr->h_source, vid);
 		goto allow;
 	}

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 992b6cc..64b2e16 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -905,7 +905,8 @@  int batadv_recv_unicast_packet(struct sk_buff *skb,
 		orig_node = batadv_orig_hash_find(bat_priv, orig_addr);
 		if (batadv_bla_is_backbone_gw(skb, orig_node, hdr_size)) {
 			batadv_dbg(BATADV_DBG_BLA, bat_priv,
-				"Dropped unicast pkt received from another backbone gw %pM.\n",
+				"recv_unicast_packet(): Dropped unicast pkt received "
+				"from another backbone gw %pM.\n",
 				orig_addr);

 			return NET_RX_DROP;