From patchwork Fri Apr 30 17:52:35 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrew Lunn <andrew@lunn.ch>
X-Patchwork-Id: 88
Return-Path: <andrew@lunn.ch>
Received: from londo.lunn.ch (londo.lunn.ch [80.238.139.98])
	by open-mesh.net (Postfix) with ESMTP id 5FA6D15419F
	for <b.a.t.m.a.n@lists.open-mesh.net>;
	Fri, 30 Apr 2010 19:52:36 +0200 (CEST)
Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian))
	id 1O7uOB-0001Ju-00; Fri, 30 Apr 2010 19:52:35 +0200
Date: Fri, 30 Apr 2010 19:52:35 +0200
From: Andrew Lunn <andrew@lunn.ch>
To: "B.A.T.M.A.N" <b.a.t.m.a.n@lists.open-mesh.net>
Message-ID: <20100430175235.GH3734@lunn.ch>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] maint tree mixup...
X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org
X-Mailman-Version: 2.1.11
Precedence: list
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2010 17:52:36 -0000

Hi Folks

It could be i'm doing something stupid here. If so, please tell me...

I'm preparing a patchset for linux. I've run into some problems.
You can see the patches to be included here:

http://git.open-mesh.org/?p=batman-adv;a=shortlog;h=refs/heads/maint

The one which is causing me problems is:

2010-03-20 Marek Lindner batman-adv: fix aggregation timing bug

When i add this patch and then try to compile i get:

drivers/staging/batman-adv/aggregation.c:207:35: error: undefined identifier 'bat_priv'

the code being:

                    (atomic_read(&bat_priv->aggregation_enabled)))

However, if you look at the patch:

2010-04-06 Marek Lindner batman-adv: convert multiple /proc files to use sysfs

which comes about 16 days later you see:

So it looks to me these patches have got out of order.....

Any ideas what happened?

    Thanks
	Andrew

--- a/types.h
+++ b/types.h
@@ -82,6 +82,8 @@ struct neigh_node {
 

 struct bat_priv {
        struct net_device_stats stats;
+       atomic_t aggregation_enabled;
+       struct kobject *mesh_obj;
 };