[B.A.T.M.A.N.] [PATCH] batman-adv: swap lines to get in sync with networking branch

[B.A.T.M.A.N.] [PATCH] batman-adv: swap lines to get in sync with networking branch

[Antonio Quartulli]

due to a merge conflict resolution handled differently in the networking branch,
we now have a small divergence between our next branch and what we already have
in net/batman-adv/ in the kernel. Since we cannot ask the kernel guys to "swap
two lines", with this patch we fix the problem in our repo

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---

- this patch is for next


 soft-interface.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soft-interface.c b/soft-interface.c
index 1aee7db..7b683e0 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -277,8 +277,8 @@ void batadv_interface_rx(struct net_device *soft_iface,
 	struct vlan_ethhdr *vhdr;
 	struct batadv_header *batadv_header = (struct batadv_header *)skb->data;
 	short vid __maybe_unused = -1;
-	bool is_bcast;
 	__be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
+	bool is_bcast;
 
 	is_bcast = (batadv_header->packet_type == BATADV_BCAST);
 
-- 
1.7.9.4

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: swap lines to get in sync with networking branch

[Marek Lindner]

On Wednesday, August 22, 2012 00:40:05 Antonio Quartulli wrote:
> due to a merge conflict resolution handled differently in the networking
> branch, we now have a small divergence between our next branch and what we
> already have in net/batman-adv/ in the kernel. Since we cannot ask the
> kernel guys to "swap two lines", with this patch we fix the problem in our
> repo
> 
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
> ---
> 
> - this patch is for next
> 
> 
>  soft-interface.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision 28d246e.

Thanks,
Marek