[B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution

[B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution

[Antonio Quartulli]

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

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution

[Marek Lindner]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
> --- 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)

Don't we want longer declarations before shorter declarations ?

Cheers,
Marek

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

On 24/02/14 01:36, Marek Lindner wrote:
> On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
>> --- 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)
> 
> Don't we want longer declarations before shorter declarations ?

Yes, but the point is that there is no patch doing this change.
This line was moved during a merge...

If you want to rearrange the variable declaration I'd suggest to do it
with one patch changing them all.


Cheers,


-- 
Antonio Quartulli


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

On 24/02/14 07:48, Antonio Quartulli wrote:
> On 24/02/14 01:36, Marek Lindner wrote:
>> On Monday 24 February 2014 00:00:18 Antonio Quartulli wrote:
>>> --- 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)
>>
>> Don't we want longer declarations before shorter declarations ?
> 
> Yes, but the point is that there is no patch doing this change.
> This line was moved during a merge...
> 
> If you want to rearrange the variable declaration I'd suggest to do it
> with one patch changing them all.

Ok, as agreed on IRC you can drop this patch. I'll slightly change my
kernel tree to adapt it to the master branch :)


Cheers,

-- 
Antonio Quartulli


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]