diff options
| author | Eric W. Biederman | 2015-09-18 21:33:04 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-09-18 22:00:04 +0200 |
| commit | a31f1adc0948930fba9ab5a111ccd735a5d864c6 (patch) | |
| tree | a1665b8a85df5c0a17cf8d6ed01f6fd9b5250a12 /net/openvswitch/conntrack.c | |
| parent | act_connmark: Remember the struct net instead of guessing it. (diff) | |
| download | kernel-qcow2-linux-a31f1adc0948930fba9ab5a111ccd735a5d864c6.tar.gz kernel-qcow2-linux-a31f1adc0948930fba9ab5a111ccd735a5d864c6.tar.xz kernel-qcow2-linux-a31f1adc0948930fba9ab5a111ccd735a5d864c6.zip | |
netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple
As gre does not have the srckey in the packet gre_pkt_to_tuple
needs to perform a lookup in it's per network namespace tables.
Pass in the proper network namespace to all pkt_to_tuple
implementations to ensure gre (and any similar protocols) can get this
right.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/openvswitch/conntrack.c')
| -rw-r--r-- | net/openvswitch/conntrack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index e8e524ad8a01..aaf5cbd6d9ae 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -345,7 +345,7 @@ ovs_ct_expect_find(struct net *net, const struct nf_conntrack_zone *zone, { struct nf_conntrack_tuple tuple; - if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb), proto, &tuple)) + if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb), proto, net, &tuple)) return NULL; return __nf_ct_expect_find(net, zone, &tuple); } |