summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c4
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,
1794 ip_send_check(iph); 1794 ip_send_check(iph);
1795 1795
1796 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); 1796 memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
1797 nf_reset(skb); 1797 nf_reset_ct(skb);
1798} 1798}
1799 1799
1800static inline int ipmr_forward_finish(struct net *net, struct sock *sk, 1800static inline int ipmr_forward_finish(struct net *net, struct sock *sk,
@@ -2140,7 +2140,7 @@ int ip_mr_input(struct sk_buff *skb)
2140 2140
2141 mroute_sk = rcu_dereference(mrt->mroute_sk); 2141 mroute_sk = rcu_dereference(mrt->mroute_sk);
2142 if (mroute_sk) { 2142 if (mroute_sk) {
2143 nf_reset(skb); 2143 nf_reset_ct(skb);
2144 raw_rcv(mroute_sk, skb); 2144 raw_rcv(mroute_sk, skb);
2145 return 0; 2145 return 0;
2146 } 2146 }