From: Antonio Quartulli <antonio@meshcoding.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution
Date: Mon, 24 Feb 2014 00:00:18 +0100 [thread overview]
Message-ID: <1393196418-4001-1-git-send-email-antonio@meshcoding.com> (raw)
While resolving a merge conflict a variable declaration was
accidentally moved onto another line.
Move it back to its original location to avoid messing up
with the in-kernel source code.
Introduced by merge commit
fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
send.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/send.c b/send.c
index d27161e..3d64ed2 100644
--- a/send.c
+++ b/send.c
@@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv,
struct batadv_orig_node *orig_node,
unsigned short vid)
{
- struct batadv_unicast_packet *unicast_packet;
struct ethhdr *ethhdr;
+ struct batadv_unicast_packet *unicast_packet;
int ret = NET_XMIT_DROP;
if (!orig_node)
--
1.8.4.5
next reply other threads:[~2014-02-23 23:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-23 23:00 Antonio Quartulli [this message]
2014-02-24 0:36 ` [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution Marek Lindner
2014-02-24 6:48 ` Antonio Quartulli
2014-02-24 8:14 ` 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=1393196418-4001-1-git-send-email-antonio@meshcoding.com \
--to=antonio@meshcoding.com \
--cc=b.a.t.m.a.n@lists.open-mesh.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