From 967c65a99059fd459b956c1588ce0ba227912c4e Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 16 Dec 1997 05:34:03 +0000
Subject: Merge with Linux 2.1.72, part 1.

---
 net/ipv6/ip6_output.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'net/ipv6/ip6_output.c')

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 7a865296f..e0b20e066 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: ip6_output.c,v 1.3 1997/03/18 18:24:37 davem Exp $
+ *	$Id: ip6_output.c,v 1.5 1997/09/21 18:33:14 kuznet Exp $
  *
  *	Based on linux/net/ipv4/ip_output.c
  *
@@ -540,6 +540,11 @@ int ip6_forward(struct sk_buff *skb)
 	struct ipv6hdr *hdr = skb->nh.ipv6h;
 	int size;
 	
+	if (ipv6_config.forwarding == 0) {
+		kfree_skb(skb, FREE_READ);
+		return -EINVAL;
+	}
+
 	/*
 	 *	check hop-by-hop options present
 	 */
-- 
cgit v1.2.3