From: Antonio Quartulli <antonio@meshcoding.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: pull request: batman-adv 2013-10-09
Date: Wed, 9 Oct 2013 21:01:01 +0200 [thread overview]
Message-ID: <20131009190101.GL3544@neomailbox.net> (raw)
In-Reply-To: <20131009.145306.1949528592789606941.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
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,
--
Antonio Quartulli
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-10-09 19:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 12:40 pull request: batman-adv 2013-10-09 Antonio Quartulli
2013-10-09 12:40 ` [PATCH 01/16] MAINTAINERS: batman-adv - update emails Antonio Quartulli
2013-10-09 12:40 ` [PATCH 02/16] batman-adv: switch to a new packet compatibility version Antonio Quartulli
2013-10-09 12:40 ` [PATCH 03/16] batman-adv: tvlv - basic infrastructure Antonio Quartulli
2013-10-09 12:40 ` [PATCH 04/16] batman-adv: tvlv - gateway download/upload bandwidth container Antonio Quartulli
2013-10-09 12:40 ` [PATCH 05/16] batman-adv: tvlv - add distributed arp table container Antonio Quartulli
2013-10-09 12:40 ` [PATCH 06/16] batman-adv: tvlv - add network coding container Antonio Quartulli
2013-10-09 12:40 ` [PATCH 07/16] batman-adv: tvlv - convert tt data sent within OGMs Antonio Quartulli
2013-10-09 12:40 ` [PATCH 08/16] batman-adv: tvlv - convert tt query packet to use tvlv unicast packets Antonio Quartulli
2013-10-09 12:40 ` [PATCH 09/16] batman-adv: tvlv - convert roaming adv " Antonio Quartulli
2013-10-09 12:40 ` [PATCH 10/16] batman-adv: use CRC32C instead of CRC16 in TT code Antonio Quartulli
2013-10-09 14:11 ` David Laight
2013-10-09 14:35 ` Antonio Quartulli
2013-10-09 15:49 ` David Laight
2013-10-09 16:10 ` Antonio Quartulli
2013-10-09 16:15 ` Antonio Quartulli
2013-10-09 16:19 ` David Laight
2013-10-09 17:05 ` Antonio Quartulli
2013-10-09 12:40 ` [PATCH 11/16] batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit Antonio Quartulli
2013-10-09 12:40 ` [PATCH 12/16] batman-adv: remove vis functionality Antonio Quartulli
2013-10-09 12:40 ` [PATCH 13/16] batman-adv: add build check macros for packet member offset Antonio Quartulli
2013-10-09 12:40 ` [PATCH 14/16] batman-adv: reorder packet types Antonio Quartulli
2013-10-09 12:40 ` [PATCH 15/16] batman-adv: remove packed from batadv_ogm_packet Antonio Quartulli
2013-10-09 12:40 ` [PATCH 16/16] batman-adv: reorder batadv_iv_flags Antonio Quartulli
2013-10-09 17:56 ` pull request: batman-adv 2013-10-09 David Miller
2013-10-09 18:53 ` David Miller
2013-10-09 19:01 ` Antonio Quartulli [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131009190101.GL3544@neomailbox.net \
--to=antonio@meshcoding.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).