linux-kernel - linux-next: build failure after merge of the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100512125653.38f442c5.sfr@canb.auug.org.au>
Date:	Wed, 12 May 2010 12:56:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Patrick McHardy <kaber@...sh.net>,
	Andreas Meissner <andreas.meissner@...airon.com>
Subject: linux-next: build failure after merge of the net tree

Hi Dave,

After merging the net tree, today's linux-next build (x86_64
allmodconfig) failed like this:

net/ipv4/ipmr.c: In function 'ipmr_cache_unresolved':
net/ipv4/ipmr.c:1001: error: 'net' undeclared (first use in this function)

Caused by commit 0c12295a741d3186987f96f518cfbdaf01abb087 ("ipv4: ipmr:
move mroute data into seperate structure") from the net tree interacting
with commit bbd725435ddb1cac732f7a8c23c21ff67f24c60f ("IPv4: unresolved
multicast route cleanup") from Linus' tree.

I applied this fix patch for today:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 12 May 2010 12:51:02 +1000
Subject: [PATCH] net: merge fix for ipmr.c

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 net/ipv4/ipmr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index db1e77a..7a7ee1c 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -998,7 +998,7 @@ ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi, struct sk_buff *skb)
 		atomic_inc(&mrt->cache_resolve_queue_len);
 		list_add(&c->list, &mrt->mfc_unres_queue);
 
-		if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
+		if (atomic_read(&mrt->cache_resolve_queue_len) == 1)
 			mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
 	}
 
-- 
1.7.1


-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/