diff options
| author | Jan Kara <jack@suse.cz> | 2019-11-06 10:52:10 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-11-06 10:52:10 +0100 |
| commit | dae82c7fd0926840c832151f3258ba751f73d348 (patch) | |
| tree | 5cdef8359f6cfb964919ffb0bfa36d2de60140b1 /net/ipv4/ipmr.c | |
| parent | a9913d7eafa74eb2e34e26aa31fe80449b999f8e (diff) | |
| parent | a0828b6ccbdfd46afbbaa9f28df359081c29109b (diff) | |
Pull series refactoring quota enabling and disabling code.
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 313470f6bb14..716d5472c022 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1794,7 +1794,7 @@ static void ip_encap(struct net *net, struct sk_buff *skb, ip_send_check(iph); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); - nf_reset(skb); + nf_reset_ct(skb); } static inline int ipmr_forward_finish(struct net *net, struct sock *sk, @@ -2140,7 +2140,7 @@ int ip_mr_input(struct sk_buff *skb) mroute_sk = rcu_dereference(mrt->mroute_sk); if (mroute_sk) { - nf_reset(skb); + nf_reset_ct(skb); raw_rcv(mroute_sk, skb); return 0; } |