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;