netdev - Re: pull request: batman-adv 2013-10-09

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 09 Oct 2013 14:53:06 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	antonio@...hcoding.com
Cc:	netdev@...r.kernel.org, b.a.t.m.a.n@...ts.open-mesh.org
Subject: Re: pull request: batman-adv 2013-10-09

From: David Miller <davem@...emloft.net>
Date: Wed, 09 Oct 2013 13:56:52 -0400 (EDT)

> Pulled, thanks.

Please don't send me stuff that doesn't build:

net/batman-adv/translation-table.c: In function ‘batadv_send_roam_adv’:
net/batman-adv/translation-table.c:2210:49: warning: left-hand operand of comma expression has no effect [-Wunused-value]
net/batman-adv/translation-table.c:2211:21: warning: left-hand operand of comma expression has no effect [-Wunused-value]
net/batman-adv/translation-table.c:2210:6: warning: statement with no effect [-Wunused-value]
net/batman-adv/translation-table.c:2211:29: error: expected ‘;’ before ‘)’ token
net/batman-adv/translation-table.c:2211:29: error: expected statement before ‘)’ toke

That looks like:

	/* before going on we have to check whether the client has
	 * already roamed to us too many times
	 */
	if (!batadv_tt_check_roam_count(bat_priv, client))
		goto out;

		   "Sending ROAMING_ADV to %pM (client %pM)\n",
		   orig_node->orig, client);

Looks like a merge problem to me.