From 8a10dd8843cc68d5de7c1813b7658731c0d30360 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 5 Jan 2006 12:17:50 -0800
Subject: [PATCH] --- yaml --- r: 16227 b: refs/heads/master c:
 47116eb201571ad1198a8d76dc3571e85ba7c8c9 h: refs/heads/master i:   16225:
 03b1e4daedd077a0f228d7f3a648da0ba50855a1   16223:
 6b19d6070e802ee0e522b440146cc690d33867e8 v: v3

---
 [refs]                                          | 2 +-
 trunk/net/ipv4/netfilter/ip_conntrack_netlink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e11af9d4649..a8ba4d8fa451 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 984955b3d7f9943becf9915601f49a1fb7a41f7a
+refs/heads/master: 47116eb201571ad1198a8d76dc3571e85ba7c8c9
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
index 5e9affdd0dbe..faa027ba687e 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -230,7 +230,7 @@ ctnetlink_dump_id(struct sk_buff *skb, const struct ip_conntrack *ct)
 static inline int
 ctnetlink_dump_use(struct sk_buff *skb, const struct ip_conntrack *ct)
 {
-	unsigned int use = htonl(atomic_read(&ct->ct_general.use));
+	u_int32_t use = htonl(atomic_read(&ct->ct_general.use));
 	
 	NFA_PUT(skb, CTA_USE, sizeof(u_int32_t), &use);
 	return 0;