1 files changed, 7 insertions, 0 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 871bdec09edb..0981c1ef3057 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -173,6 +173,13 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
 
 int ip6_output(struct sk_buff *skb)
 {
+        struct inet6_dev *idev = ip6_dst_idev(skb->dst);
+        if (unlikely(idev->cnf.disable_ipv6)) {
+                IP6_INC_STATS(idev, IPSTATS_MIB_OUTDISCARDS);
+                kfree_skb(skb);
+                return 0;
+        }
+
         if ((skb->len > ip6_skb_dst_mtu(skb) && !skb_is_gso(skb)) ||
                                 dst_allfrag(skb->dst))
                 return ip6_fragment(skb, ip6_output2);