On Wed, Oct 09, 2013 at 02:53:06PM -0400, David Miller wrote:
From: David Miller davem@davemloft.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.
Oh damn. Sorry David. I have probably done something wrong during my last rebase on top net-next.
I'll fix, double check and resend the pull request.
Regards,