From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: "Martin Hundebøll" <martin@hundeboll.net>
Subject: Re: [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Detect coding nodes and remove these after timeout
Date: Fri, 30 Nov 2012 16:39:46 +0100 [thread overview]
Message-ID: <6805886.t8ZOUf2Ty6@bentobox> (raw)
In-Reply-To: <be77d51107acf2b1063534bac509bb2330c2b7d2.1354287613.git.martin@hundeboll.net>
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
On Friday 30 November 2012 16:08:31 Martin Hundebøll wrote:
> +<<<<<<< HEAD
> +=======
> + * batadv_can_nc_with_orig - checks whether the given orig node is suitable
> for + * coding or not
> + * @bat_priv:
Sry, I dont think we need merge conflicts in KernelDoc.
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-11-30 15:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-30 15:08 [B.A.T.M.A.N.] [PATCH 0/6] CATWOMAN: Network coding in batman-adv Martin Hundebøll
2012-11-30 15:08 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: Add the initial code for network coding Martin Hundebøll
2012-11-30 15:08 ` [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: Detect coding nodes and remove these after timeout Martin Hundebøll
2012-11-30 15:39 ` Sven Eckelmann [this message]
2012-11-30 15:08 ` [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Buffer unicast packets before forward Martin Hundebøll
2012-12-01 2:03 ` Antonio Quartulli
2012-11-30 15:08 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: Code and transmit packets if possible Martin Hundebøll
2012-12-01 2:23 ` Antonio Quartulli
2012-11-30 15:08 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Save overheard and tx packets for decoding Martin Hundebøll
2012-12-01 11:01 ` Antonio Quartulli
2012-12-01 11:07 ` Antonio Quartulli
2012-11-30 15:08 ` [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: Receive coded packets and decode them Martin Hundebøll
2012-12-01 11:14 ` [B.A.T.M.A.N.] [PATCH 0/6] CATWOMAN: Network coding in batman-adv Antonio Quartulli
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=6805886.t8ZOUf2Ty6@bentobox \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=martin@hundeboll.net \
/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