From 8abb719409c9060a7c0676f76e9182c1e0b8ca46 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 19 Mar 2000 01:28:40 +0000
Subject: Merge with 2.3.99-pre1.

---
 net/packet/af_packet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'net/packet/af_packet.c')

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 3a9d20e9c..799ec9476 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -5,7 +5,7 @@
  *
  *		PACKET - implements raw packet sockets.
  *
- * Version:	$Id: af_packet.c,v 1.32 2000/02/21 16:25:55 davem Exp $
+ * Version:	$Id: af_packet.c,v 1.33 2000/03/13 22:11:50 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -1439,6 +1439,7 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
 		case SIOCGIFBR:
 		case SIOCSIFBR:
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+#ifdef CONFIG_INET
 #ifdef CONFIG_KMOD
 			if (br_ioctl_hook == NULL)
 				request_module("bridge");
@@ -1446,6 +1447,7 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
 			if (br_ioctl_hook != NULL)
 				return br_ioctl_hook(arg);
 #endif
+#endif				
 
 			return -ENOPKG;
 			
-- 
cgit v1.2.3