diff options
author | David S. Miller | 2012-01-03 00:56:49 +0100 |
---|---|---|
committer | David S. Miller | 2012-01-03 00:56:49 +0100 |
commit | 455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch) | |
tree | 6ff12c853b4a26612ceea8191a8eae29b130b670 /net/netfilter/nf_conntrack_netlink.c | |
parent | netfilter: nfnetlink_acct: fix nfnl_acct_get operation (diff) | |
parent | Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
download | kernel-qcow2-linux-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.gz kernel-qcow2-linux-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.xz kernel-qcow2-linux-455ffa607f0efa90c9fec99604553b7cdd5274b2.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index bb10c077a01a..e07dc3ae930e 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -135,7 +135,7 @@ nla_put_failure: static inline int ctnetlink_dump_timeout(struct sk_buff *skb, const struct nf_conn *ct) { - long timeout = (ct->timeout.expires - jiffies) / HZ; + long timeout = ((long)ct->timeout.expires - (long)jiffies) / HZ; if (timeout < 0) timeout = 0; @@ -1650,7 +1650,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, const struct nf_conntrack_expect *exp) { struct nf_conn *master = exp->master; - long timeout = (exp->timeout.expires - jiffies) / HZ; + long timeout = ((long)exp->timeout.expires - (long)jiffies) / HZ; struct nf_conn_help *help; if (timeout < 0) |