diff mbox

maint tree mixup...

Message ID 20100430175235.GH3734@lunn.ch
State Not Applicable, archived
Headers show

Commit Message

Andrew Lunn April 30, 2010, 5:52 p.m. UTC
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

Comments

Andrew Lunn April 30, 2010, 5:59 p.m. UTC | #1
On Fri, Apr 30, 2010 at 07:52:35PM +0200, Andrew Lunn wrote:
> Hi Folks
> 
> It could be i'm doing something stupid here. If so, please tell me...

Found the problem/fix. The next patch in the sequence repairs the
damage.

I just need to squash the two patches together any everything will be
good.

	Andrew
diff mbox

Patch

--- 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;
 };