← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/netfilter/ipvs/ip_vs_nfct.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/netfilter/ipvs/ip_vs_nfct.c
141
141
        struct nf_conntrack_tuple *orig, new_reply;
142
142
        struct ip_vs_conn *cp;
143
143
        struct ip_vs_conn_param p;
 
144
        struct net *net = nf_ct_net(ct);
144
145
 
145
146
        if (exp->tuple.src.l3num != PF_INET)
146
147
                return;
155
156
 
156
157
        /* RS->CLIENT */
157
158
        orig = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
158
 
        ip_vs_conn_fill_param(exp->tuple.src.l3num, orig->dst.protonum,
 
159
        ip_vs_conn_fill_param(net, exp->tuple.src.l3num, orig->dst.protonum,
159
160
                              &orig->src.u3, orig->src.u.tcp.port,
160
161
                              &orig->dst.u3, orig->dst.u.tcp.port, &p);
161
162
        cp = ip_vs_conn_out_get(&p);
268
269
                " for conn " FMT_CONN "\n",
269
270
                __func__, ARG_TUPLE(&tuple), ARG_CONN(cp));
270
271
 
271
 
        h = nf_conntrack_find_get(&init_net, NF_CT_DEFAULT_ZONE, &tuple);
 
272
        h = nf_conntrack_find_get(ip_vs_conn_net(cp), NF_CT_DEFAULT_ZONE,
 
273
                                  &tuple);
272
274
        if (h) {
273
275
                ct = nf_ct_tuplehash_to_ctrack(h);
274
276
                /* Show what happens instead of calling nf_ct_kill() */