diff options
Diffstat (limited to 'drivers/net/vrf.c')
-rw-r--r-- | drivers/net/vrf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index a4b38a980c3c..ee52bde058df 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c | |||
@@ -366,7 +366,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk, | |||
366 | struct neighbour *neigh; | 366 | struct neighbour *neigh; |
367 | int ret; | 367 | int ret; |
368 | 368 | ||
369 | nf_reset(skb); | 369 | nf_reset_ct(skb); |
370 | 370 | ||
371 | skb->protocol = htons(ETH_P_IPV6); | 371 | skb->protocol = htons(ETH_P_IPV6); |
372 | skb->dev = dev; | 372 | skb->dev = dev; |
@@ -459,7 +459,7 @@ static struct sk_buff *vrf_ip6_out_direct(struct net_device *vrf_dev, | |||
459 | 459 | ||
460 | /* reset skb device */ | 460 | /* reset skb device */ |
461 | if (likely(err == 1)) | 461 | if (likely(err == 1)) |
462 | nf_reset(skb); | 462 | nf_reset_ct(skb); |
463 | else | 463 | else |
464 | skb = NULL; | 464 | skb = NULL; |
465 | 465 | ||
@@ -560,7 +560,7 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s | |||
560 | bool is_v6gw = false; | 560 | bool is_v6gw = false; |
561 | int ret = -EINVAL; | 561 | int ret = -EINVAL; |
562 | 562 | ||
563 | nf_reset(skb); | 563 | nf_reset_ct(skb); |
564 | 564 | ||
565 | /* Be paranoid, rather than too clever. */ | 565 | /* Be paranoid, rather than too clever. */ |
566 | if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) { | 566 | if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) { |
@@ -670,7 +670,7 @@ static struct sk_buff *vrf_ip_out_direct(struct net_device *vrf_dev, | |||
670 | 670 | ||
671 | /* reset skb device */ | 671 | /* reset skb device */ |
672 | if (likely(err == 1)) | 672 | if (likely(err == 1)) |
673 | nf_reset(skb); | 673 | nf_reset_ct(skb); |
674 | else | 674 | else |
675 | skb = NULL; | 675 | skb = NULL; |
676 | 676 | ||