Re: [B.A.T.M.A.N.] [PATCHv2] batman-adv: change VID semantic in the BLA code

[Simon Wunderlich]

Acked-by: Simon Wunderlich s...@hrz.tu-chemnitz.de

Just a small thing which can be adjusted when merging:

On Mon, Apr 08, 2013 at 11:17:16AM +0200, Antonio Quartulli wrote:
 @@ -909,8 +910,9 @@ static int batadv_bla_process_claim(struct batadv_priv 
 *bat_priv,
  ethhdr);
   if (ret == 1)
   batadv_dbg(BATADV_DBG_BLA, bat_priv,
 -bla_process_claim(): received a claim frame from 
 another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n,
 -ethhdr-h_source, vid, hw_src, hw_dst);
 +bla_process_claim(): received a claim frame from 
 another group. From: %pM on vid %u ...(hw_src %pM, hw_dst %pM)\n,
 +ethhdr-h_source, vid, hw_src,
 +hw_dst);


This could be put on one line.

Cheers,
Simon



signature.asc
Description: Digital signature

Re: [B.A.T.M.A.N.] [PATCHv2] batman-adv: change VID semantic in the BLA code

[Marek Lindner]

On Monday, April 08, 2013 17:17:16 Antonio Quartulli wrote:
 @@ -307,7 +307,7 @@ static void batadv_bla_send_claim(struct batadv_priv
 *bat_priv, uint8_t *mac, */
 memcpy(ethhdr-h_source, mac, ETH_ALEN);
 batadv_dbg(BATADV_DBG_BLA, bat_priv,
 -  bla_send_claim(): CLAIM %pM on vid %d\n, mac,
 vid); +  bla_send_claim(): CLAIM %pM on vid
 %u\n, mac, vid); break;
 case BATADV_CLAIM_TYPE_UNCLAIM:
 /* unclaim frame
 @@ -315,7 +315,7 @@ static void batadv_bla_send_claim(struct batadv_priv
 *bat_priv, uint8_t *mac, */
 memcpy(hw_src, mac, ETH_ALEN);
 batadv_dbg(BATADV_DBG_BLA, bat_priv,
 -  bla_send_claim(): UNCLAIM %pM on vid %d\n,
 mac, +  bla_send_claim(): UNCLAIM %pM on vid
 %u\n, mac, vid);
 break;
 case BATADV_CLAIM_TYPE_ANNOUNCE:
 @@ -324,7 +324,7 @@ static void batadv_bla_send_claim(struct batadv_priv
 *bat_priv, uint8_t *mac, */
 memcpy(hw_src, mac, ETH_ALEN);
 batadv_dbg(BATADV_DBG_BLA, bat_priv,
 -  bla_send_claim(): ANNOUNCE of %pM on vid %d\n,
 +  bla_send_claim(): ANNOUNCE of %pM on vid %u\n,

It should be %hu instead of %u for unsigned short.

Please make sure the printed vid does not contain the BATADV_VLAN_HAS_TAG 
mixed with the real vid.

Cheers,
Marek