patch-2.3.48 linux/net/ipv4/af_inet.c

• Lines: 35
• Date: Mon Feb 21 17:35:06 2000
• Orig file: v2.3.47/linux/net/ipv4/af_inet.c
• Orig date: Sun Feb 20 21:12:40 2000

diff -u --recursive --new-file v2.3.47/linux/net/ipv4/af_inet.c linux/net/ipv4/af_inet.c
@@ -5,7 +5,7 @@
  *
  *		PF_INET protocol family socket handler.
  *
- * Version:	$Id: af_inet.c,v 1.107 2000/02/18 16:47:20 davem Exp $
+ * Version:	$Id: af_inet.c,v 1.108 2000/02/21 16:25:59 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -135,7 +135,9 @@
 int (*dlci_ioctl_hook)(unsigned int, void *) = NULL;
 #endif
 
+#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
 int (*br_ioctl_hook)(unsigned long) = NULL;
+#endif
 
 /* New destruction routine */
 
@@ -837,13 +839,14 @@
 			return(devinet_ioctl(cmd,(void *) arg));
 		case SIOCGIFBR:
 		case SIOCSIFBR:
+#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
 #ifdef CONFIG_KMOD
 			if (br_ioctl_hook == NULL)
 				request_module("bridge");
 #endif
 			if (br_ioctl_hook != NULL)
 				return br_ioctl_hook(arg);
-
+#endif
 			return -ENOPKG;
 			
 		case SIOCADDDLCI: