← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to net/ipv4/netfilter/nf_nat_core.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/netfilter/nf_nat_core.c
212
212
        maxip = ntohl(range->max_ip);
213
213
        j = jhash_2words((__force u32)tuple->src.u3.ip,
214
214
                         range->flags & IP_NAT_RANGE_PERSISTENT ?
215
 
                                0 : (__force u32)tuple->dst.u3.ip, 0);
 
215
                                (__force u32)tuple->dst.u3.ip : 0, 0);
216
216
        j = ((u64)j * (maxip - minip + 1)) >> 32;
217
217
        *var_ipp = htonl(minip + j);
218
218
}