path: root/net/sched/act_connmark.c
diff options
authorEric W. Biederman <ebiederm@xmission.com>2015-09-18 14:33:04 -0500
committerPablo Neira Ayuso <pablo@netfilter.org>2015-09-18 22:00:04 +0200
commita31f1adc0948930fba9ab5a111ccd735a5d864c6 (patch)
treea1665b8a85df5c0a17cf8d6ed01f6fd9b5250a12 /net/sched/act_connmark.c
parentact_connmark: Remember the struct net instead of guessing it. (diff)
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/sched/act_connmark.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 413ac39147d8..bb41699c6c49 100644
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -68,7 +68,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
- proto, &tuple))
+ proto, ca->net, &tuple))
goto out;
zone.id = ca->zone;